Bump version: 0.19.2 → 0.19.3

* bugfix:
  Hey Plato! If You're reading this - fix your variable types and there will be 90% less bugs in Your code!!!
  Some TelegramBot tweaks
  when full energy update citizen info would stop working because trying to get timedelta from now - _last_full_energy_report
  Too broad exception was cought without notifying about actual error - when Telegram isn't enabled

erepublik/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.19.1'
+__version__ = '0.19.3'
 
 from erepublik import classes, utils
 from erepublik.citizen import Citizen

erepublik/citizen.py

@@ -156,7 +156,7 @@ class Citizen(CitizenAPI):
             raise ErepublikException("Something went wrong! Can't find token in page! Exiting!")
         try:
             self.update_citizen_info(resp.text)
-        except:
+        except (AttributeError, json.JSONDecodeError, ValueError, KeyError):
             pass
 
     def _login(self):
@@ -212,8 +212,8 @@ class Citizen(CitizenAPI):
                 return self.get(url, **kwargs)
 
             try:
-                self.update_citizen_info(html=response.text)
-            except:
+                self.update_citizen_info(response.text)
+            except (AttributeError, json.JSONDecodeError, ValueError, KeyError):
                 pass
 
             if self._errors_in_response(response):
@@ -2195,11 +2195,14 @@ class Citizen(CitizenAPI):
         while not isinstance(available_weapons, list):
             available_weapons = self._get_military_show_weapons(battle_id).json()
         weapon_quality = -1
+        weapon_damage = 0
         if not battle.is_air:
             for weapon in available_weapons:
-                if weapon['weaponId'] == 7 and weapon['weaponQuantity'] > 30:
-                    weapon_quality = 7
-                    break
+                try:
+                    if weapon['weaponQuantity'] > 30 and weapon['damage'] > weapon_damage:
+                        weapon_quality = int(weapon['weaponId'])
+                except ValueError:
+                    pass
         return self.change_weapon(battle_id, weapon_quality)
 
     def change_weapon(self, battle_id: int, weapon_quality: int) -> int:

erepublik/classes.py

@@ -1242,11 +1242,11 @@ class EnergyToFight:
 
 
 class TelegramBot:
-    __initialized = False
+    __initialized: bool = False
     __queue: List[str]
-    chat_id = 0
-    api_url = ""
-    player_name = ""
+    chat_id: int = 0
+    api_url: str = ""
+    player_name: str = ""
     __thread_stopper: threading.Event
     _last_time: datetime.datetime
     _last_full_energy_report: datetime.datetime
@@ -1257,12 +1257,13 @@ class TelegramBot:
         self._threads = []
         self.__queue = []
         self.__thread_stopper = threading.Event() if stop_event is None else stop_event
+        self._last_full_energy_report = self._next_time = self._last_time = utils.good_timedelta(utils.now(), datetime.timedelta(hours=1))
 
     @property
     def __dict__(self):
-        return dict(chat_id=self.chat_id, api_url=self.api_url, player=self.player_name, last_time=self._last_time,
-                    next_time=self._next_time, queue=self.__queue, initialized=self.__initialized,
-                    has_threads=bool(len(self._threads)))
+        return {'chat_id': self.chat_id, 'api_url': self.api_url, 'player': self.player_name,
+                'last_time': self._last_time, 'next_time': self._next_time, 'queue': self.__queue,
+                'initialized': self.__initialized, 'has_threads': bool(len(self._threads))}
 
     def do_init(self, chat_id: int, token: str, player_name: str = ""):
         self.chat_id = chat_id

erepublik/utils.py

@@ -6,6 +6,7 @@ import sys
 import time
 import traceback
 import unicodedata
+from decimal import Decimal
 from pathlib import Path
 from typing import Any, List, Mapping, NoReturn, Optional, Union
 
@@ -344,6 +345,11 @@ def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commi
     trace = inspect.trace()
     if trace:
         trace = trace[-1][0].f_locals
+        if trace.get('__name__') == '__main__':
+            trace = {'commit_id': trace.get('COMMIT_ID'),
+                     'interactive': trace.get('INTERACTIVE'),
+                     'version': trace.get('__version__'),
+                     'config': trace.get('CONFIG')}
     else:
         trace = dict()
     send_email(name, content, citizen, local_vars=trace)
@@ -393,27 +399,28 @@ def slugify(value, allow_unicode=False) -> str:
 
 
 def calculate_hit(strength: float, rang: int, tp: bool, elite: bool, ne: bool, booster: int = 0,
-                  weapon: int = 200) -> float:
-    base_dmg = 10 * (1 + strength / 400) * (1 + rang / 5) * (1 + weapon / 100)
-    dmg = int(base_dmg * 10 + 5) // 10
+                  weapon: int = 200, is_deploy: bool = False) -> Decimal:
+    dec = 3 if is_deploy else 0
+    base_str = (1 + Decimal(str(round(strength, 3))) / 400)
+    base_rnk = (1 + Decimal(str(rang / 5)))
+    base_wpn = (1 + Decimal(str(weapon / 100)))
+    dmg = 10 * base_str * base_rnk * base_wpn
 
-    booster_multiplier = (100 + booster) / 100
-    booster_dmg = dmg * booster_multiplier
-    dmg = int(booster_dmg * 10 + 5) // 10
+    if elite:
+        dmg = dmg * 11 / 10
 
-    elite = 1.1 if elite else 1
-    elite_dmg = dmg * elite
-    dmg = int(elite_dmg)
+    if tp and rang >= 70:
+        dmg = dmg * (1 + Decimal((rang - 69) / 10))
 
-    legend = 1 if (not tp or rang < 70) else 1 + (rang - 69) / 10
-    legend_dmg = dmg * legend
-    dmg = int(legend_dmg)
+    dmg = dmg * (100 + booster) / 100
 
-    return dmg * (1.1 if ne else 1)
+    if ne:
+        dmg = dmg * 11 / 10
+    return round(dmg, dec)
 
 
-def ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False,
-                         booster: int = 0, weapon_power: int = 200) -> float:
+def get_ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False,
+                             booster: int = 0, weapon_power: int = 200) -> Decimal:
     r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json()
     rang = r['military']['militaryData']['ground']['rankNumber']
     strength = r['military']['militaryData']['ground']['strength']
@@ -424,8 +431,8 @@ def ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patr
     return calculate_hit(strength, rang, true_patriot, elite, natural_enemy, booster, weapon_power)
 
 
-def air_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0,
-                      weapon_power: int = 0) -> float:
+def get_air_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0,
+                          weapon_power: int = 0) -> Decimal:
     r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json()
     rang = r['military']['militaryData']['aircraft']['rankNumber']
     elite = r['citizenAttributes']['level'] > 100

requirements_dev.txt

@@ -5,7 +5,7 @@ flake8==3.7.9
 ipython==7.11.1
 isort==4.3.21
 pip==19.3.1
-PyInstaller==3.5
+PyInstaller==3.6
 pytz==2019.3
 requests==2.22.0
 setuptools==44.0.0

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.19.1
+current_version = 0.19.3
 commit = True
 tag = True
 

setup.py

@@ -43,6 +43,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.19.1',
+    version='0.19.3',
     zip_safe=False,
 )