Bump version: 0.30.0.3 → 0.30.0.4

README.rst

@@ -10,6 +10,13 @@ eRepublik script
         :target: https://erepublik.readthedocs.io/en/latest/?badge=latest
         :alt: Documentation Status
 
+.. image:: https://github.com/eeriks/erepublik/actions/workflows/codeql-analysis.yml/badge.svg?branch=master
+        :target: //github.com/eeriks/erepublik/actions/workflows/codeql-analysis.yml
+        :alt: CodeQL
+
+.. image:: https://github.com/eeriks/erepublik/actions/workflows/pythonpackage.yml/badge.svg
+        :target: https://github.com/eeriks/erepublik/actions/workflows/pythonpackage.yml
+        :alt: Python package
 
 Python package for automated eRepublik playing
 

erepublik/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = """Eriks Karls"""
 __email__ = "eriks@72.lv"
-__version__ = "0.29.2.3"
+__version__ = "0.30.0.4"
 
 from erepublik.citizen import Citizen
 

erepublik/_logging.py

@@ -9,7 +9,7 @@ from logging import LogRecord, handlers
 from pathlib import Path
 from typing import Any, Dict, Union
 
-import requests
+from httpx import post
 
 from erepublik.classes import Reporter
 from erepublik.constants import erep_tz
@@ -112,7 +112,7 @@ class ErepublikErrorHTTTPHandler(handlers.HTTPHandler):
 
     def _get_last_response(self) -> Dict[str, str]:
         response = self.reporter.citizen.r
-        url = response.url
+        url = str(response.url)
         last_index = url.index("?") if "?" in url else len(response.url)
 
         name = slugify(response.url[len(self.reporter.citizen.url) : last_index])
@@ -209,6 +209,6 @@ class ErepublikErrorHTTTPHandler(handlers.HTTPHandler):
             headers = {"Authorization": s}
             data = self.mapLogRecord(record)
             files = data.pop("files") if "files" in data else None
-            requests.post(f"{proto}://{self.host}{self.url}", headers=headers, data=data, files=files)
+            post(f"{proto}://{self.host}{self.url}", headers=headers, data=data, files=files)
         except Exception:
             self.handleError(record)

erepublik/access_points.py

@@ -4,9 +4,8 @@ import random
 import time
 from typing import Any, Dict, List, Mapping, Union
 
-from requests import Response, Session
+from httpx import Response, Client as Session, RequestError
-from requests.exceptions import ConnectionError
+#from requests_toolbelt.utils import dump
-from requests_toolbelt.utils import dump
 
 from erepublik import constants, utils
 
@@ -15,11 +14,12 @@ __all__ = ["SlowRequests", "CitizenAPI"]
 
 class SlowRequests(Session):
     last_time: datetime.datetime
-    timeout: datetime.timedelta = datetime.timedelta(milliseconds=500)
+    __timeout: datetime.timedelta = datetime.timedelta(milliseconds=500)
     debug: bool = False
+    http2 = True
 
     def __init__(self, proxies: Dict[str, str] = None, user_agent: str = None):
-        super().__init__()
+        super().__init__(http2=True, follow_redirects=True)
         if proxies:
             self.proxies = proxies
         if user_agent is None:
@@ -27,13 +27,13 @@ class SlowRequests(Session):
         self.request_log_name = utils.get_file(utils.now().strftime("debug/requests_%Y-%m-%d.log"))
         self.last_time = utils.now()
         self.headers.update({"User-Agent": user_agent})
-        self.hooks["response"] = [self._log_response]
+        self.event_hooks["response"] = [self._log_response]
 
     @property
     def as_dict(self):
         return dict(
             last_time=self.last_time,
-            timeout=self.timeout,
+            __timeout=self.__timeout,
             cookies=self.cookies.get_dict(),
             debug=self.debug,
             user_agent=self.headers["User-Agent"],
@@ -46,14 +46,14 @@ class SlowRequests(Session):
         self._log_request(url, method, **kwargs)
         try:
             resp = super().request(method, url, *args, **kwargs)
-        except ConnectionError:
+        except RequestError:
             time.sleep(1)
             return self.request(method, url, *args, **kwargs)
         # self._log_response(resp)
         return resp
 
     def _slow_down_requests(self):
-        ltt = utils.good_timedelta(self.last_time, self.timeout)
+        ltt = utils.good_timedelta(self.last_time, self.__timeout)
         if ltt > utils.now():
             seconds = (ltt - utils.now()).total_seconds()
             time.sleep(seconds if seconds > 0 else 0)
@@ -81,7 +81,7 @@ class SlowRequests(Session):
 
     def _log_response(self, response: Response, *args, **kwargs):
         redirect = kwargs.get("redirect")
-        url = response.request.url
+        url = str(response.request.url)
         if self.debug:
             if response.history and not redirect:
                 for hist_resp in response.history:
@@ -92,7 +92,7 @@ class SlowRequests(Session):
             fd_time = self.last_time.strftime("%Y/%m/%d/%H-%M-%S")
             fd_name = utils.slugify(url[len(CitizenBaseAPI.url) :])
             fd_extra = "_REDIRECT" if redirect else ""
-
+            response.read()
             try:
                 utils.json.loads(response.text)
                 fd_ext = "json"
@@ -102,9 +102,9 @@ class SlowRequests(Session):
             filename = f"{fd_path}/{fd_time}_{fd_name}{fd_extra}.{fd_ext}"
             utils.write_file(filename, response.text)
 
-            if not redirect:
+            #if not redirect:
-                data = dump.dump_all(response)
+            #    data = dump.dump_all(response)
-                utils.write_file(f"debug/dumps/{fd_time}_{fd_name}{fd_extra}.{fd_ext}.dump", data.decode("utf8"))
+            #    utils.write_file(f"debug/dumps/{fd_time}_{fd_name}{fd_extra}.{fd_ext}.dump", data.decode("utf8"))
 
     @staticmethod
     def get_random_user_agent() -> str:
@@ -145,7 +145,7 @@ class CitizenBaseAPI:
         return dict(url=self.url, request=self._req.as_dict, token=self.token)
 
     def post(self, url: str, data=None, json=None, **kwargs) -> Response:
-        return self._req.post(url, data, json, **kwargs)
+        return self._req.post(url, data=data, json=json, **kwargs)
 
     def get(self, url: str, **kwargs) -> Response:
         return self._req.get(url, **kwargs)

erepublik/citizen.py

@@ -9,7 +9,7 @@ from threading import Event
 from time import sleep
 from typing import Any, Dict, List, NoReturn, Optional, Set, Tuple, TypedDict, Union
 
-from requests import RequestException, Response
+from httpx import RequestError, Response
 
 from erepublik import _types as types
 from erepublik import access_points, classes, constants, utils
@@ -118,7 +118,7 @@ class BaseCitizen(access_points.CitizenAPI):
         else:
             try:
                 response = super().get(url, **kwargs)
-            except RequestException:
+            except RequestError:
                 self.report_error("Network error while issuing GET request")
                 self.sleep(60)
                 return self.get(url, **kwargs)
@@ -151,7 +151,7 @@ class BaseCitizen(access_points.CitizenAPI):
 
         try:
             response = super().post(url, data=data, json=json, **kwargs)
-        except RequestException:
+        except RequestError:
             self.report_error("Network error while issuing POST request")
             self.sleep(60)
             return self.post(url, data=data, json=json, **kwargs)
@@ -613,7 +613,10 @@ class BaseCitizen(access_points.CitizenAPI):
             "comment_url",
             "rfc2109",
         ]
-        cookies = [{attr: getattr(cookie, attr) for attr in cookie_attrs} for cookie in self._req.cookies]
+        cookies = []
+        for cookie in self._req.cookies.jar:
+            cookies.append({attr: getattr(cookie, attr, None) for attr in cookie_attrs if hasattr(cookie, attr)})
+        #cookies = [{attr: getattr(cookie, attr) for attr in cookie_attrs} for cookie in self._req.cookies]
 
         with open(filename, "w") as f:
             utils.json_dump(

erepublik/classes.py

@@ -7,7 +7,7 @@ from decimal import Decimal
 from io import BytesIO
 from typing import Any, Dict, Generator, Iterable, List, NamedTuple, NoReturn, Optional, Tuple, Union
 
-from requests import HTTPError, Response, Session, post
+from httpx import HTTPError, Response, Client as Session, post
 
 from erepublik import _types as types
 from erepublik import constants, utils
@@ -772,7 +772,7 @@ class Reporter:
 
     def __init__(self, citizen):
         self._citizen = weakref.ref(citizen)
-        self._req = Session()
+        self._req = Session(follow_redirects=True)
         self.url = "https://erep.lv"
         self._req.headers.update({"user-agent": "eRepublik Script Reporter v3", "erep-version": utils.__version__})
         self.__to_update = []

erepublik/utils.py

@@ -12,8 +12,8 @@ from pathlib import Path
 from typing import Any, Dict, List, Union
 
 import pytz
-import requests
+import httpx
-from requests import Response
+from httpx import Response
 
 from erepublik import __version__, constants
 
@@ -204,7 +204,7 @@ def calculate_hit(
 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()
+    r = httpx.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"]
     elite = r["citizenAttributes"]["level"] > 100
@@ -217,7 +217,7 @@ def get_ground_hit_dmg_value(
 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()
+    r = httpx.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
     return calculate_hit(0, rang, true_patriot, elite, natural_enemy, booster, weapon_power)

requirements.txt

@@ -1,4 +1,8 @@
 PySocks==1.7.1
 pytz>2021.0
-requests>2.25.0,!=2.27.0
+httpx==0.22.0
-requests-toolbelt==0.9.1
+h2==4.1.0
+socksio==1.0.0
+brotli==1.0.9
+#requests>2.25.0,!=2.27.0
+#requests-toolbelt==0.9.1

setup.cfg

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

setup.py

@@ -49,6 +49,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/eeriks/erepublik/",
-    version="0.29.2.3",
+    version="0.30.0.4",
     zip_safe=False,
 )