Add CP and Level to db, webhook, and frontend #277

tallypokemap · 2017-06-01T19:37:21Z

CP and Pokemon Level are as useful as IV in that if you level 30 accounts they are nice to report. Since we are reporting IV, it makes sense to report CP and Level as well. Credit to Asner who's code helped me add CP.

walaoaaa1234 · 2017-06-03T06:15:39Z

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "monocle-icons"]
 	path = monocle/static/monocle-icons
-	url = https://github.com/Noctem/monocle-icons.git
+	url = https://github.com/Imaginum/monocle-icons.git


change back to original repo
monocle/static/monocle-icons << remove?

Duh.... good catch.

nickmhc · 2017-06-04T03:47:33Z

Traceback (most recent call last):
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/engine/base.py", line 1182, in _execute_context
    context)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/engine/default.py", line 470, in do_execute
    cursor.execute(statement, parameters)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/cursors.py", line 250, in execute
    self.errorhandler(self, exc, value)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/connections.py", line 50, in defaulterrorhandler
    raise errorvalue
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/cursors.py", line 247, in execute
    res = self._query(query)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/cursors.py", line 411, in _query
    rowcount = self._do_query(q)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/cursors.py", line 374, in _do_query
    db.query(q)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/connections.py", line 292, in query
    _mysql.connection.query(self, query)
_mysql_exceptions.OperationalError: (1054, "Unknown column 'mystery_sightings.cp' in 'field list'")

The above exception was the direct cause of the following exception:

Traceback (most recent call last):
  File "/home/nmc/github/monocle/monocle/db_proc.py", line 46, in run
    db.add_mystery(session, item)
  File "/home/nmc/github/monocle/monocle/db.py", line 441, in add_mystery
    .filter(Mystery.spawn_id == pokemon['spawn_id']) \
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/orm/query.py", line 2755, in first
    ret = list(self[0:1])
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/orm/query.py", line 2547, in __getitem__
    return list(res)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/orm/query.py", line 2855, in __iter__
    return self._execute_and_instances(context)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/orm/query.py", line 2878, in _execute_and_instances
    result = conn.execute(querycontext.statement, self._params)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/engine/base.py", line 945, in execute
    return meth(self, multiparams, params)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/sql/elements.py", line 263, in _execute_on_connection
    return connection._execute_clauseelement(self, multiparams, params)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/engine/base.py", line 1053, in _execute_clauseelement
    compiled_sql, distilled_params
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/engine/base.py", line 1189, in _execute_context
    context)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/engine/base.py", line 1402, in _handle_dbapi_exception
    exc_info
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/util/compat.py", line 203, in raise_from_cause
    reraise(type(exception), exception, tb=exc_tb, cause=cause)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/util/compat.py", line 186, in reraise
    raise value.with_traceback(tb)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/engine/base.py", line 1182, in _execute_context
    context)
  File "/usr/local/lib/python3.5/dist-packages/sqlalchemy/engine/default.py", line 470, in do_execute
    cursor.execute(statement, parameters)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/cursors.py", line 250, in execute
    self.errorhandler(self, exc, value)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/connections.py", line 50, in defaulterrorhandler
    raise errorvalue
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/cursors.py", line 247, in execute
    res = self._query(query)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/cursors.py", line 411, in _query
    rowcount = self._do_query(q)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/cursors.py", line 374, in _do_query
    db.query(q)
  File "/usr/local/lib/python3.5/dist-packages/MySQLdb/connections.py", line 292, in query
    _mysql.connection.query(self, query)
sqlalchemy.exc.OperationalError: (_mysql_exceptions.OperationalError) (1054, "Unknown column 'mystery_sightings.cp' in 'field list'") [SQL: 'SELECT mystery_sightings.id AS mystery_sightings_id, mystery_sightings.pokemon_id AS mystery_sightings_pokemon_id, mystery_sightings.spawn_id AS mystery_sightings_spawn_id, mystery_sightings.encounter_id AS mystery_sightings_encounter_id, mystery_sightings.lat AS mystery_sightings_lat, mystery_sightings.lon AS mystery_sightings_lon, mystery_sightings.first_seen AS mystery_sightings_first_seen, mystery_sightings.first_seconds AS mystery_sightings_first_seconds, mystery_sightings.last_seconds AS mystery_sightings_last_seconds, mystery_sightings.seen_range AS mystery_sightings_seen_range, mystery_sightings.atk_iv AS mystery_sightings_atk_iv, mystery_sightings.def_iv AS mystery_sightings_def_iv, mystery_sightings.sta_iv AS mystery_sightings_sta_iv, mystery_sightings.move_1 AS mystery_sightings_move_1, mystery_sightings.move_2 AS mystery_sightings_move_2, mystery_sightings.cp AS mystery_sightings_cp, mystery_sightings.cp_multiplier AS mystery_sightings_cp_multiplier \nFROM mystery_sightings \nWHERE mystery_sightings.encounter_id = %s AND mystery_sightings.spawn_id = %s \n LIMIT %s'] [parameters: (11998290704452769133, 8848365737923, 1)]```

walaoaaa1234 · 2017-06-04T03:57:43Z

mysql migration, add this 2 column manually to mystery_sightings, sightings @nickmhc

 +    cp = Column(SmallInteger)
 +    cp_multiplier = Column(FLOAT_TYPE)

tejas0029 · 2017-06-05T09:28:20Z

I need someone to use the map and make a report bot with showing cp iv and moveset
I am paying for it
Need it for discord
Message if anyone can do it

evenly-epic-mule · 2017-06-05T10:23:19Z

monocle/static/js/main.js

-    } else {
+        content += 'IV: ' + item.atk + ' atk, ' + item.def + ' def, ' + item.sta + ' sta<br>';
+		content += 'CP: ' + item.cp + ' | Lvl: ' + item.level + '<br>';
+		} else {


could you please replace the tabs with spaces

evenly-epic-mule · 2017-06-05T10:28:55Z

monocle/web_utils.py

@@ -105,6 +105,9 @@ def sighting_to_marker(pokemon, names=POKEMON, moves=MOVES, damage=DAMAGE):
        marker['move2'] = moves[move2]
        marker['damage1'] = damage[move1]
        marker['damage2'] = damage[move2]
+    if pokemon.cp:


it you add the cp column it should be filled with null or 0, so I'd guess this is not needed as it would only be a "if there still are legacy pokemon" which should disapear after 30-60 mins

ghost · 2017-06-05T17:26:44Z

web_sanic.py

@@ -177,6 +177,9 @@ def sighting_to_marker(pokemon, names=POKEMON, moves=MOVES, damage=DAMAGE, trash
        marker['move2'] = moves[move2]
        marker['damage1'] = damage[move1]
        marker['damage2'] = damage[move2]
+    if pokemon.cp:
+        marker['cp'] = pokemon.cp


Also, this should be "pokemon['cp'] and pokemon['cp_multiplier']
Make sure you are importing your calc_pokemon_level func as well

tejas0029 · 2017-06-06T18:18:06Z

Hello i am looking for a developer to prepare discord coordinate bot.
You seem experienced and well known, i pay for work
Reply if interested

tejas0029 · 2017-06-06T18:27:44Z

Hello i am looking for a developer to prepare discord coordinate bot.
You seem experienced and well known, i pay for work
Reply if interested
Mail--- rajm74506@gmail.com

jesshub · 2017-06-11T09:21:31Z

Can this be approved?
Thanks

imp3tus

extra space at Line 794 of worker.py

Bart274 · 2017-06-15T08:28:45Z

@tallypokemap it would be awesome if you could also include height and weight and form for unowns into the db so it could be shown on the map and in the webhook. this is helpful for getting the Fisherman and Youngster badges :-)

evenly-epic-mule · 2017-06-15T11:33:28Z

monocle/static/js/main.js

-    } else {
+        content += 'IV: ' + item.atk + ' atk, ' + item.def + ' def, ' + item.sta + ' sta<br>';
+        content += 'CP: ' + item.cp + ' | Lvl: ' + item.level + '<br>';
+        } else {


indentation

evenly-epic-mule · 2017-06-15T11:33:33Z

monocle/db.py

+        ) test
+        group by spawn_id
+    ''')
+    return query


Could you please create a own branch for this PR or not merge other stuff until it is closed?

evenly-epic-mule · 2017-06-15T11:38:21Z

monocle/db.py

@@ -225,6 +225,8 @@ class Sighting(Base):
    sta_iv = Column(TINY_TYPE)
    move_1 = Column(SmallInteger)
    move_2 = Column(SmallInteger)
+    cp = Column(SmallInteger)
+    cp_multiplier = Column(FLOAT_TYPE)


I think it would be better to save the level here.
That way cp_multiplier => level is computed once, otherwise you are doing it once for every visitor (in web.py / web_sanic.py) besides an extra one for the webhook.
besides that a SmallInteger should use less space than a FLOAT_TYPE

evenly-epic-mule · 2017-06-15T11:41:41Z

@Bart274 that shouldn't be done as a column each, as it only needs more resources - I think we need a extra_details column or so besides that it should go in an own PR

evenly-epic-mule · 2017-06-15T11:43:39Z

@tallypokemap besides the requested changes it would be nice if you'd merge the commits together

evenly-epic-mule

just as a little hint git commit --amend will let you update your last commit
but you will then have to push with git push -f

evenly-epic-mule · 2017-06-17T09:36:34Z

monocle/web_utils.py

@@ -5,7 +5,7 @@

 from monocle import sanitized as conf
 from monocle.db import get_forts, Pokestop, session_scope, Sighting, Spawnpoint
-from monocle.utils import Units, get_address
+from monocle.utils import Units, get_address, calc_pokemon_level


that shouldn't be needed anylonger

tallypokemap · 2017-06-17T22:10:56Z

For those updating from a previous version:
mysql migration, delete this column from mystery_sightings, sightings

cp_multiplier = Column(FLOAT_TYPE)

and replace with

level = Column(SmallInteger)

just2codes · 2017-06-30T14:57:31Z

How far is this to be merged ? Just tried it and aint working

nickmhc · 2017-07-11T16:23:07Z

I just tried this and it doesn't work for level information anymore

M3G4THEKING · 2017-07-14T14:52:24Z

Workers, but dont display the correct cp and level of pokemons @tallypokemap

tallypokemap · 2017-07-14T22:13:19Z

@nickmhc You might need to check your logs to see what is going on. I still have level working just fine on my map.
@m3g4mInD You will need Level 30 workers for it to show the correct stats for a level 30 player. Everything below level 30 is randomized.

M3G4THEKING · 2017-07-14T22:33:14Z

@tallypokemap yeap i use all accts lv 30+, but still have this issue.i have verifie all accts, all accts detect larvitar and snorlax, they dont are sb or warnings
Update: Now all works fine,thanks

walaoaaa1234 reviewed Jun 3, 2017

View reviewed changes

evenly-epic-mule reviewed Jun 5, 2017

View reviewed changes

ghost reviewed Jun 5, 2017

View reviewed changes

walaoaaa1234 mentioned this pull request Jun 14, 2017

Missing CP information from web and webhook #290

Open

imp3tus reviewed Jun 14, 2017

View reviewed changes

evenly-epic-mule suggested changes Jun 15, 2017

View reviewed changes

tallypokemap force-pushed the develop branch 3 times, most recently from 931a6ab to 2981baf Compare June 16, 2017 21:53

evenly-epic-mule suggested changes Jun 17, 2017

View reviewed changes

tallypokemap force-pushed the develop branch from 9e29b92 to 7738eb4 Compare June 17, 2017 18:09

tallypokemap force-pushed the develop branch 5 times, most recently from 298d122 to a0779ba Compare June 27, 2017 13:11

tallypokemap force-pushed the develop branch 2 times, most recently from 9253892 to c2e5193 Compare July 8, 2017 15:23

add CP and lvl information to db, wh, and frontend

a550a64

tallypokemap force-pushed the develop branch 2 times, most recently from 59f2524 to a550a64 Compare July 24, 2017 20:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CP and Level to db, webhook, and frontend #277

Add CP and Level to db, webhook, and frontend #277

tallypokemap commented Jun 1, 2017

walaoaaa1234 Jun 3, 2017 •

edited

Loading

tallypokemap Jun 4, 2017

nickmhc commented Jun 4, 2017 •

edited

Loading

walaoaaa1234 commented Jun 4, 2017

tejas0029 commented Jun 5, 2017

evenly-epic-mule Jun 5, 2017

evenly-epic-mule Jun 5, 2017

ghost Jun 5, 2017

tejas0029 commented Jun 6, 2017

tejas0029 commented Jun 6, 2017

jesshub commented Jun 11, 2017

imp3tus left a comment •

edited

Loading

Bart274 commented Jun 15, 2017 •

edited

Loading

evenly-epic-mule Jun 15, 2017 •

edited

Loading

evenly-epic-mule Jun 15, 2017

evenly-epic-mule Jun 15, 2017

evenly-epic-mule commented Jun 15, 2017

evenly-epic-mule commented Jun 15, 2017

evenly-epic-mule left a comment

evenly-epic-mule Jun 17, 2017

tallypokemap commented Jun 17, 2017

just2codes commented Jun 30, 2017

nickmhc commented Jul 11, 2017

M3G4THEKING commented Jul 14, 2017

tallypokemap commented Jul 14, 2017

M3G4THEKING commented Jul 14, 2017 •

edited

Loading

Add CP and Level to db, webhook, and frontend #277

Are you sure you want to change the base?

Add CP and Level to db, webhook, and frontend #277

Conversation

tallypokemap commented Jun 1, 2017

walaoaaa1234 Jun 3, 2017 • edited Loading

Choose a reason for hiding this comment

tallypokemap Jun 4, 2017

Choose a reason for hiding this comment

nickmhc commented Jun 4, 2017 • edited Loading

walaoaaa1234 commented Jun 4, 2017

tejas0029 commented Jun 5, 2017

evenly-epic-mule Jun 5, 2017

Choose a reason for hiding this comment

evenly-epic-mule Jun 5, 2017

Choose a reason for hiding this comment

ghost Jun 5, 2017

Choose a reason for hiding this comment

tejas0029 commented Jun 6, 2017

tejas0029 commented Jun 6, 2017

jesshub commented Jun 11, 2017

imp3tus left a comment • edited Loading

Choose a reason for hiding this comment

Bart274 commented Jun 15, 2017 • edited Loading

evenly-epic-mule Jun 15, 2017 • edited Loading

Choose a reason for hiding this comment

evenly-epic-mule Jun 15, 2017

Choose a reason for hiding this comment

evenly-epic-mule Jun 15, 2017

Choose a reason for hiding this comment

evenly-epic-mule commented Jun 15, 2017

evenly-epic-mule commented Jun 15, 2017

evenly-epic-mule left a comment

Choose a reason for hiding this comment

evenly-epic-mule Jun 17, 2017

Choose a reason for hiding this comment

tallypokemap commented Jun 17, 2017

just2codes commented Jun 30, 2017

nickmhc commented Jul 11, 2017

M3G4THEKING commented Jul 14, 2017

tallypokemap commented Jul 14, 2017

M3G4THEKING commented Jul 14, 2017 • edited Loading

walaoaaa1234 Jun 3, 2017 •

edited

Loading

nickmhc commented Jun 4, 2017 •

edited

Loading

imp3tus left a comment •

edited

Loading

Bart274 commented Jun 15, 2017 •

edited

Loading

evenly-epic-mule Jun 15, 2017 •

edited

Loading

M3G4THEKING commented Jul 14, 2017 •

edited

Loading