Bump version: 0.22.2.1 → 0.22.3

`{"stock":10.494533,"consume":10.5}` rounds to 0

HISTORY.rst

@@ -2,6 +2,24 @@
 History
 =======
 
+0.22.3 (2020-11-16)
+-------------------
+* Fixed round to even bug when doing wam and not enough raw.
+* Added meta industry airplaneRaw
+* Added method `Citizen.buy_market_offer(OfferItem, amount=None)` to directly buy market offer with included travel to country and back.
+
+0.22.2 (2020-11-09)
+-------------------
+* Allow querying market offers for q2-q5 aircrafts
+* Added "Ticket" industry
+
+0.22.1 (2020-11-04)
+-------------------
+* Requirement update
+* Unified product naming in inventory and other places based on `erepublik.constants.INDUSTRIES` values
+* `erepublik.Citizen` parameter `auto_login` now defaults to `False`
+* Continued work on more verbose action and result logging
+
 0.22.0 (2020-10-22)
 -------------------
 * Ability to dump session and restore from file

docs/index.html

@@ -93,8 +93,8 @@
                                 <label class="custom-control-label" for="wam">Work as manager</label>
                             </div>
                             <div class="custom-control custom-switch">
-                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="employ">
+                                <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="employees">
-                                <label class="custom-control-label" for="employ">Employ employees</label>
+                                <label class="custom-control-label" for="employees">Employ employees</label>
                             </div>
                             <div class="custom-control custom-switch">
                                 <input type="checkbox" class="custom-control-input" onchange="updateJson()" id="auto_buy_raw" checked>
@@ -236,8 +236,8 @@
         config.debug = debug.checked;
         let wam = document.getElementById('wam'); // Generated
         config.wam = wam.checked;
-        let employ = document.getElementById('employ'); // Generated
+        let employees = document.getElementById('employees'); // Generated
-        config.employ = employ.checked;
+        config.employees = employees.checked;
 
         let auto_buy_raw = document.getElementById('auto_buy_raw'); // Generated
         let auto_sell_all = document.getElementById('auto_sell_all'); // Generated
@@ -249,7 +249,7 @@
         let auto_sell_house = document.getElementById('auto_sell_house'); // Generated
         let auto_sell_arm = document.getElementById('auto_sell_arm'); // Generated
         let auto_sell_air = document.getElementById('auto_sell_air'); // Generated
-        if (config.wam || config.employ) {
+        if (config.wam || config.employees) {
             auto_buy_raw.disabled = false;
             auto_sell_all.disabled = false;
             auto_sell_frm.disabled = false;
@@ -359,7 +359,7 @@
   "interactive": true,
   "debug": true,
   "wam": true,
-  "employ": true,
+  "employees": true,
   "auto_buy_raw": true,
   "auto_sell_all": true,
   "auto_sell": [

erepublik/__init__.py

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

erepublik/access_points.py

@@ -15,9 +15,11 @@ class SlowRequests(Session):
     timeout: datetime.timedelta = datetime.timedelta(milliseconds=500)
     uas: List[str] = [
         # Chrome
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36',  # noqa
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Safari/537.36',  # noqa
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36',  # noqa
         'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.106 Safari/537.36',  # noqa
+        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36',
         'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Safari/537.36',
         'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36',
         'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.106 Safari/537.36',

erepublik/citizen.py

@@ -12,6 +12,7 @@ from typing import Any, Dict, List, NoReturn, Optional, Set, Tuple, Union
 from requests import HTTPError, RequestException, Response
 
 from . import utils, classes, access_points, constants
+from .classes import OfferItem
 
 
 class BaseCitizen(access_points.CitizenAPI):
@@ -264,6 +265,8 @@ class BaseCitizen(access_points.CitizenAPI):
                     kind = re.sub(r'_q\d\d*', "", item_data.get('token'))
                 else:
                     kind = item_data.get('type')
+                if constants.INDUSTRIES[kind]:
+                    kind = constants.INDUSTRIES[constants.INDUSTRIES[kind]]
                 if kind not in active_items:
                     active_items[kind] = {}
                 icon = item_data['icon'] if item_data[
@@ -316,11 +319,15 @@ class BaseCitizen(access_points.CitizenAPI):
                                 self.eb_small += amount
                             elif q == 15:
                                 self.eb_small += amount
+                                item_data.update(token='energy_bar')
                     kind = re.sub(r'_q\d\d*', "", item_data.get('token'))
 
                 if item_data.get('token', "") == "house_q100":
                     self.ot_points = item_data['amount']
 
+                if constants.INDUSTRIES[kind]:
+                    kind = constants.INDUSTRIES[constants.INDUSTRIES[kind]]
+
                 if kind not in final_items:
                     final_items[kind] = {}
 
@@ -339,10 +346,10 @@ class BaseCitizen(access_points.CitizenAPI):
                         icon = "/images/modules/pvp/ghost_boosters/icon_booster_30_60.png"
                     else:
                         icon = "//www.erepublik.net/images/modules/manager/tab_storage.png"
-                item_data = dict(kind=kind, quality=item_data.get('quality', 0), amount=item_data.get('amount', 0),
+                _item_data = dict(kind=kind, quality=item_data.get('quality', 0), amount=item_data.get('amount', 0),
-                                 durability=item_data.get('duration', 0), icon=icon, name=name)
+                                  durability=item_data.get('duration', 0), icon=icon, name=name)
                 if item_data.get('type') in ('damageBoosters', "aircraftDamageBoosters"):
-                    item_data = {item_data['durability']: item_data}
+                    _item_data = {_item_data['durability']: _item_data}
                 else:
                     if item_data.get('type') == 'bomb':
                         firepower = 0
@@ -351,9 +358,9 @@ class BaseCitizen(access_points.CitizenAPI):
                         except AttributeError:
                             pass
                         finally:
-                            item_data.update(fire_power=firepower)
+                            _item_data.update(fire_power=firepower)
-                    item_data = {item_data['quality']: item_data}
+                    _item_data = {_item_data['quality']: _item_data}
-                final_items[kind].update(item_data)
+                final_items[kind].update(_item_data)
 
         raw_materials: Dict[str, Dict[int, Dict[str, Union[str, int]]]] = {}
         if data.get("rawMaterials", {}).get("items", {}):
@@ -682,9 +689,15 @@ class BaseCitizen(access_points.CitizenAPI):
         if re.search(r'Occasionally there are a couple of things which we need to check or to implement in order make '
                      r'your experience in eRepublik more pleasant. <strong>Don\'t worry about ongoing battles, timer '
                      r'will be stopped during maintenance.</strong>', response.text):
-            self.write_log("eRepublik ss having maintenance. Sleeping for 5 minutes")
+            self.write_log("eRepublik is having maintenance. Sleeping for 5 minutes")
             self.sleep(5 * 60)
             return True
+
+        if re.search('We are experiencing some tehnical dificulties', response.text):
+            self.write_log("eRepublik is having technical difficulties. Sleeping for 5 minutes")
+            self.sleep(5 * 60)
+            return True
+
         return bool(re.search(r'body id="error"|Internal Server Error|'
                               r'CSRF attack detected|meta http-equiv="refresh"|'
                               r'not_authenticated', response.text))
@@ -908,6 +921,7 @@ class CitizenCompanies(BaseCitizen):
 
         if int(free_inventory * 0.75) < self.my_companies.get_needed_inventory_usage(wam_list):
             self.update_inventory()
+            free_inventory = self.inventory_status["total"] - self.inventory_status["used"]
 
         while wam_list and free_inventory < self.my_companies.get_needed_inventory_usage(wam_list):
             wam_list.pop(-1)
@@ -976,7 +990,7 @@ class CitizenEconomy(CitizenTravel):
     def check_house_durability(self) -> Dict[int, datetime]:
         ret = {}
         inv = self.get_inventory()
-        for house_quality, active_house in inv['active'].get('house', {}).items():
+        for house_quality, active_house in inv['active'].get('House', {}).items():
             till = utils.good_timedelta(self.now, timedelta(seconds=active_house['time_left']))
             ret.update({house_quality: till})
         return ret
@@ -985,14 +999,14 @@ class CitizenEconomy(CitizenTravel):
         original_region = self.details.current_country, self.details.current_region
         ok_to_activate = False
         inv = self.get_inventory()
-        if not inv['final'].get('house', {}).get(q, {}):
+        if not inv['final'].get('House', {}).get(q, {}):
             countries = [self.details.citizenship, ]
             if self.details.current_country != self.details.citizenship:
                 countries.append(self.details.current_country)
-            offers = [self.get_market_offers("house", q, country)[f"q{q}"] for country in countries]
+            offers = [self.get_market_offers("House", q, country)[f"q{q}"] for country in countries]
             local_cheapest = sorted(offers, key=lambda o: o.price)[0]
 
-            global_cheapest = self.get_market_offers("house", q)[f"q{q}"]
+            global_cheapest = self.get_market_offers("House", q)[f"q{q}"]
             if global_cheapest.price + 200 < local_cheapest.price:
                 if self.travel_to_country(global_cheapest.country):
                     buy = self.buy_from_market(global_cheapest.offer_id, 1)
@@ -1029,7 +1043,7 @@ class CitizenEconomy(CitizenTravel):
         r: Dict[str, Any] = self._post_economy_activate_house(quality).json()
         self._update_inventory_data(r)
         if r.get("status") and not r.get("error"):
-            house: Dict[str, Union[int, str]] = self.get_inventory()['active']['house'][quality]
+            house: Dict[str, Union[int, str]] = self.get_inventory()['active']['House'][quality]
             time_left = timedelta(seconds=house["time_left"])
             active_until = utils.good_timedelta(self.now, time_left)
             self._report_action(
@@ -1085,7 +1099,7 @@ class CitizenEconomy(CitizenTravel):
         offers = self.get_my_market_offers()
         for offer in offers:
             if offer['id'] == offer_id:
-                industry = constants.INDUSTRIES[offer['industry']]
+                industry = constants.INDUSTRIES[offer['industryId']]
                 amount = offer['amount']
                 q = offer['quality']
                 price = offer['price']
@@ -1097,7 +1111,7 @@ class CitizenEconomy(CitizenTravel):
                     self._report_action("ECONOMY_DELETE_OFFER",
                                         f"Removed offer for {amount} x {industry} q{q} for {price}cc/each",
                                         kwargs=offer)
-                return ret.get('error')
+                return not ret.get('error')
         else:
             self._report_action("ECONOMY_DELETE_OFFER", f"Unable to find offer id{offer_id}", kwargs={'offers': offers})
         return False
@@ -1128,25 +1142,42 @@ class CitizenEconomy(CitizenTravel):
         message = (f"Posted market offer for {amount}q{quality} "
                    f"{constants.INDUSTRIES[industry]} for price {price}cc")
         self._report_action("ECONOMY_SELL_PRODUCTS", message, kwargs=ret)
-        return bool(ret.get('error', True))
+        return not bool(ret.get('error', True))
 
     def buy_from_market(self, offer: int, amount: int) -> dict:
         ret = self._post_economy_marketplace_actions('buy', offer=offer, amount=amount)
         json_ret = ret.json()
-        if json_ret.get('error'):
+        if not json_ret.get('error', True):
-            return json_ret
-        else:
             self.details.cc = ret.json()['currency']
             self.details.gold = ret.json()['gold']
             json_ret.pop("offerUpdate", None)
-            self._report_action("BOUGHT_PRODUCTS", "", kwargs=json_ret)
+            self._report_action("BOUGHT_PRODUCTS", json_ret.get('message'), kwargs=json_ret)
+        return json_ret
+
+    def buy_market_offer(self, offer: OfferItem, amount: int = None) -> dict:
+        if amount is None or amount > offer.amount:
+            amount = offer.amount
+        traveled = False
+        if not self.details.current_country == offer.country:
+            traveled = True
+            self.travel_to_country(offer.country)
+        ret = self._post_economy_marketplace_actions('buy', offer=offer.offer_id, amount=amount)
+        json_ret = ret.json()
+        if not json_ret.get('error', True):
+            self.details.cc = ret.json()['currency']
+            self.details.gold = ret.json()['gold']
+            json_ret.pop("offerUpdate", None)
+            self._report_action("BOUGHT_PRODUCTS", json_ret.get('message'), kwargs=json_ret)
+        if traveled:
+            self.travel_to_residence()
         return json_ret
 
     def get_market_offers(
         self, product_name: str, quality: int = None, country: constants.Country = None
     ) -> Dict[str, classes.OfferItem]:
         raw_short_names = dict(frm="foodRaw", wrm="weaponRaw", hrm="houseRaw", arm="airplaneRaw")
-        q1_industries = ["aircraft"] + list(raw_short_names.values())
+        q1_industries = list(raw_short_names.values())
+        q5_industries = ['house', 'aircraft', 'ticket']
         if product_name in raw_short_names:
             quality = 1
             product_name = raw_short_names[product_name]
@@ -1160,7 +1191,7 @@ class CitizenEconomy(CitizenTravel):
         if quality:
             offers[f"q{quality}"] = classes.OfferItem()
         else:
-            max_quality = 1 if product_name in q1_industries else 5 if product_name == 'house' else 7
+            max_quality = 1 if product_name in q1_industries else 5 if product_name.lower() in q5_industries else 7
             for q in range(max_quality):
                 offers[f"q{q + 1}"] = classes.OfferItem()
 
@@ -2563,7 +2594,11 @@ class Citizen(CitizenAnniversary, CitizenCompanies, CitizenEconomy, CitizenLeade
             if raw_kind:
                 raw_kind = raw_kind.group(1)
                 result = response.get("result", {})
-                amount_needed = round(result.get("consume", 0) - result.get("stock", 0) + 0.49)
+                amount_needed = round(result.get("consume", 0) - result.get("stock", 0) + 0.5)
+                self._report_action(
+                    'WORK_AS_MANAGER', f"Unable to wam! Missing {amount_needed} {raw_kind}, will try to buy.",
+                    kwargs=response
+                )
                 start_place = (self.details.current_country, self.details.current_region)
                 while amount_needed > 0:
                     amount = amount_needed
@@ -2572,20 +2607,31 @@ class Citizen(CitizenAnniversary, CitizenCompanies, CitizenEconomy, CitizenLeade
 
                     if not best_offer.country == self.details.current_country:
                         self.travel_to_country(best_offer.country)
+                    self._report_action("ECONOMY_BUY", f"Attempting to buy {amount} {raw_kind} for {best_offer.price*amount}cc")
                     rj = self.buy_from_market(amount=amount, offer=best_offer.offer_id)
                     if not rj.get('error'):
                         amount_needed -= amount
                     else:
                         self.write_log(rj.get('message', ""))
+                        self._report_action(
+                            "ECONOMY_BUY", f"Unable to buy products! Reason: {rj.get('message')}", kwargs=rj
+                        )
                         break
                 else:
                     if not start_place == (self.details.current_country, self.details.current_region):
                         self.travel_to_holding(holding)
                     self._wam(holding)
                     return
+
+                if not start_place == (self.details.current_country, self.details.current_region):
+                    self.travel_to_residence()
+                    return
         elif response.get("message") == "not_enough_health_food":
             self.buy_food()
             self._wam(holding)
+        elif response.get("message") == "tax_money":
+            self._report_action("WORK_AS_MANAGER", "Not enough money to work as manager!", kwargs=response)
+            self.write_log("Not enough money to work as manager!")
         else:
             msg = "I was not able to wam and or employ because:\n{}".format(response)
             self._report_action("WORK_AS_MANAGER", f"Worked as manager failed: {msg}", kwargs=response)

erepublik/constants.py

@@ -53,14 +53,14 @@ class Country:
 
 
 class Industries:
-    __by_name = {'food': 1, 'weapon': 2, 'house': 4, 'aircraft': 23,
+    __by_name = {'food': 1, 'weapon': 2, 'ticket':3, 'house': 4, 'aircraft': 23,
-                 'foodraw': 7, 'weaponraw': 12, 'houseraw': 18, 'aircraftraw': 24,
+                 'foodraw': 7, 'weaponraw': 12, 'houseraw': 18, 'aircraftraw': 24, 'airplaneraw': 24,
                  'frm': 7, 'wrm': 12, 'hrm': 18, 'arm': 24,
                  'frm q1': 7, 'frm q2': 8, 'frm q3': 9, 'frm q4': 10, 'frm q5': 11,
                  'wrm q1': 12, 'wrm q2': 13, 'wrm q3': 14, 'wrm q4': 15, 'wrm q5': 16,
                  'hrm q1': 18, 'hrm q2': 19, 'hrm q3': 20, 'hrm q4': 21, 'hrm q5': 22,
                  'arm q1': 24, 'arm q2': 25, 'arm q3': 26, 'arm q4': 27, 'arm q5': 28}
-    __by_id = {1: "Food", 2: "Weapon", 4: "House", 23: "Aircraft",
+    __by_id = {1: "Food", 2: "Weapon", 3: "Ticket", 4: "House", 23: "Aircraft",
                7: "foodRaw", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
                12: "weaponRaw", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
                17: "houseRaw", 18: "houseRaw", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",

examples/battle_launcher.py

@@ -29,7 +29,7 @@ def _battle_launcher(player: Citizen):
     """
     global CONFIG
     finished_war_ids = {*[]}
-    war_data = CONFIG.get('start_battles', {})
+    war_data = CONFIG.get('battle_launcher', {})
     war_ids = {int(war_id) for war_id in war_data.keys()}
     next_attack_time = player.now
     next_attack_time = next_attack_time.replace(minute=next_attack_time.minute // 5 * 5, second=0)
@@ -45,7 +45,7 @@ def _battle_launcher(player: Citizen):
 
                 status = player.get_war_status(war_id)
                 if status.get('ended', False):
-                    CONFIG['start_battles'].pop(war_id, None)
+                    CONFIG['battle_launcher'].pop(war_id, None)
                     finished_war_ids.add(war_id)
                     continue
                 elif not status.get('can_attack'):
@@ -64,7 +64,15 @@ def _battle_launcher(player: Citizen):
                                     player.update_war_info()
                                     battle_id = player.get_war_status(war_id).get("battle_id")
                                     if battle_id is not None and battle_id in player.all_battles:
-                                        player.fight(battle_id, player.details.citizenship, hits)
+                                        battle = player.all_battles.get(battle_id)
+                                        for division in battle.div.values():
+                                            if division.div == player.division:
+                                                div = division
+                                                break
+                                        else:
+                                            player.report_error("Players division not found in the first round!")
+                                            break
+                                        player.fight(battle, div, battle.invader, hits)
                                         break
                                     player.sleep(1)
                         if attacked:

examples/eat_work_train.py

@@ -6,7 +6,11 @@ CONFIG = {
     'email': 'player@email.com',
     'password': 'Pa$5w0rd!',
     'interactive': True,
-    'debug': True
+    'debug': True,
+    'work': True,
+    'ot': True,  # Work OverTime
+    'wam': True,  # WorkAsManager
+    'train': True
 }
 
 
@@ -14,7 +18,10 @@ CONFIG = {
 def main():
     player = Citizen(email=CONFIG['email'], password=CONFIG['password'], auto_login=False)
     player.config.interactive = CONFIG['interactive']
-    player.config.fight = CONFIG['fight']
+    player.config.work = CONFIG['work']
+    player.config.train = CONFIG['train']
+    player.config.ot = CONFIG['ot']
+    player.config.wam = CONFIG['wam']
     player.set_debug(CONFIG.get('debug', False))
     player.login()
     now = player.now.replace(second=0, microsecond=0)
@@ -76,7 +83,7 @@ def main():
                 tasks.update({'eat': next_time})
 
             if tasks.get('ot', dt_max) <= now:
-                player.write_log("Doing task: ot")
+                player.write_log("Doing task: work overtime")
                 if now > player.my_companies.next_ot_time:
                     player.work_ot()
                     next_time = now + timedelta(minutes=60)

requirements_dev.txt

@@ -2,15 +2,15 @@ bump2version==1.0.1
 coverage==5.3
 edx-sphinx-theme==1.5.0
 flake8==3.8.4
-ipython>=7.18.1
+ipython>=7.19.0
 isort==5.6.4
 pip==20.2.4
 PyInstaller==4.0
-pytz==2020.1
+pytz==2020.4
-pytest==6.1.1
+pytest==6.1.2
 responses==0.12.0
 setuptools==50.3.2
-Sphinx==3.2.1
+Sphinx==3.3.0
 requests==2.24.0
 PySocks==1.7.1
 tox==3.20.1

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.22.1.2
+current_version = 0.22.3
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?

setup.py

@@ -12,7 +12,7 @@ with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
 requirements = [
-    'pytz==2020.1',
+    'pytz==2020.4',
     'requests==2.24.0',
     'PySocks==1.7.1'
 ]
@@ -20,7 +20,7 @@ requirements = [
 setup_requirements = []
 
 test_requirements = [
-    "pytest==6.1.0",
+    "pytest==6.1.2",
     "responses==0.12.0"
 ]
 
@@ -50,6 +50,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.22.1.2',
+    version='0.22.3',
     zip_safe=False,
 )