hltv-async-api 0.5.2__tar.gz → 0.6.0__tar.gz

{hltv_async_api-0.5.2 → hltv_async_api-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hltv_async_api
-Version: 0.5.2
+Version: 0.6.0
 Summary: Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
 Author: Akim Slys
 Author-email: akimslys2003@gmail.com
@@ -203,7 +203,7 @@ pip install hltv-async-api
     >>>[{'id': '19230', 'rank': 1, 'name': 'm0NESY', 'team': 'G2', 'maps': '44', 'rating': '1.37'}, {'id': '18053', 'rank': 2, 'name': 'broky', 'team': 'FaZe', 'maps': '54', 'rating': '1.19'}]
     ```
 
-* **get async def get(type: str, id: int | str | None = None, title: str | None = None, team1: str | None = None, team2: str | None = None):**
+* **get(type: str, id: int | str | None = None, title: str | None = None, team1: str | None = None, team2: str | None = None):**
   (BETA) This method is not finished. Possible types 'events', 'matches', 'teams', also u can add id | title | team1 | team2, to parse more.
   ex. 
   

{hltv_async_api-0.5.2 → hltv_async_api-0.6.0}/README.md

@@ -180,7 +180,7 @@ pip install hltv-async-api
     >>>[{'id': '19230', 'rank': 1, 'name': 'm0NESY', 'team': 'G2', 'maps': '44', 'rating': '1.37'}, {'id': '18053', 'rank': 2, 'name': 'broky', 'team': 'FaZe', 'maps': '54', 'rating': '1.19'}]
     ```
 
-* **get async def get(type: str, id: int | str | None = None, title: str | None = None, team1: str | None = None, team2: str | None = None):**
+* **get(type: str, id: int | str | None = None, title: str | None = None, team1: str | None = None, team2: str | None = None):**
   (BETA) This method is not finished. Possible types 'events', 'matches', 'teams', also u can add id | title | team1 | team2, to parse more.
   ex. 
   

{hltv_async_api-0.5.2 → hltv_async_api-0.6.0}/hltv_async_api/__init__.py

@@ -6,4 +6,4 @@
 from .aiohltv import Hltv
 
 __author__ = 'akimerslys'
-__version__ = '0.5.2'
+__version__ = '0.6.0'

{hltv_async_api-0.5.2 → hltv_async_api-0.6.0}/hltv_async_api/aiohltv.py

@@ -1,3 +1,4 @@
+import time
 from typing import Any, List
 from datetime import date, datetime, timedelta
 import pytz
@@ -18,14 +19,13 @@ import logging
 class Hltv:
     def __init__(self, max_delay: int = 15,
                  timeout: int = 5,
-                 use_proxy: bool = False,
                  proxy_path: str | None = None,
                  proxy_list: list | None = None,
                  debug: bool = False,
                  max_retries: int = 0,
                  proxy_protocol: str | None = None,
                  proxy_one_time: bool = False,
-                 true_session: bool = False,
+                 one_time_session: bool = True,
                  ):
         self.headers = {
             "referer": "https://www.hltv.org/stats",
@@ -35,11 +35,12 @@ class Hltv:
         self.MAX_DELAY = max_delay
         self.timeout = timeout
         self.max_retries = max_retries
-        self.USE_PROXY = use_proxy
         self.PROXY_PATH = proxy_path
         self.PROXY_LIST = proxy_list
         self.PROXY_PROTOCOL = proxy_protocol
         self.PROXY_ONCE = proxy_one_time
+        self.ONE_TIME_SESSION = one_time_session
+        self.session = None
         self.DEBUG = debug
         self._configure_logging()
         self.logger = logging.getLogger(__name__)
@@ -48,16 +49,21 @@ class Hltv:
             with open(self.PROXY_PATH, "r") as file:
                 self.PROXY_LIST = [line.strip() for line in file.readlines()]
 
-        self.TRUE_SESSION = true_session
-        self.session = None
+        if proxy_path or proxy_list:
+            self.USE_PROXY = True
+        else:
+            self.USE_PROXY = False
+
+        self._create_session()
 
     def _configure_logging(self):
         level = logging.DEBUG if self.DEBUG else logging.INFO
         logging.basicConfig(level=level, format="%(message)s")
 
-    async def _create_session(self):
-        self.logger.debug('Creating Session')
-        self.session = ClientSession()
+    def _create_session(self):
+        if not self.session:
+            self.logger.debug('Creating Session')
+            self.session = ClientSession()
 
     async def close_session(self):
         if self.session:
@@ -74,7 +80,7 @@ class Hltv:
                max_retries: int | None = None,
                proxy_protocol: str | None = None,
                proxy_one_time: bool | None = None,
-               true_session: bool | None = None,
+               one_time_session: bool | None = None,
                ):
         if max_delay:
             self.MAX_DELAY = max_delay
@@ -90,8 +96,8 @@ class Hltv:
             self.PROXY_PROTOCOL = proxy_protocol
         if proxy_one_time is not None:
             self.PROXY_ONCE = proxy_one_time
-        if true_session is not None:
-            self.TRUE_SESSION = true_session
+        if one_time_session is not None:
+            self.ONE_TIME_SESSION = one_time_session
         if debug is not None:
             self.DEBUG = debug
             self._configure_logging()
@@ -99,7 +105,7 @@ class Hltv:
             with open(self.PROXY_PATH, "r") as file:
                 self.PROXY_LIST = [line.strip() for line in file.readlines()]
 
-    async def _get_proxy(self):
+    def _get_proxy(self):
         proxy = self.PROXY_LIST[0]
 
         if self.PROXY_PROTOCOL and proxy != '' and self.PROXY_PROTOCOL not in proxy:
@@ -107,7 +113,7 @@ class Hltv:
 
         return proxy
 
-    async def _switch_proxy(self):
+    def _switch_proxy(self):
         if self.PROXY_ONCE:
             self.logger.debug(f'Removing proxy {self.PROXY_LIST[0]}')
             self.PROXY_LIST = self.PROXY_LIST[1:]
@@ -129,9 +135,9 @@ class Hltv:
                 return True
         return False
 
-    async def _parse_error_handler(self, delay: int = 0) -> int:
+    def _parse_error_handler(self, delay: int = 0) -> int:
         if self.USE_PROXY:
-            await self._switch_proxy()
+            self._switch_proxy()
         else:
             if delay < self.MAX_DELAY:
                 delay += 1
@@ -145,7 +151,7 @@ class Hltv:
         proxy = ''
         # setup new proxy, cuz old one was switched
         if self.USE_PROXY:
-            proxy = await self._get_proxy()
+            proxy = self._get_proxy()
         else:
             # delay, only for non proxy users. (default = 1-15s)
             await asyncio.sleep(delay)
@@ -154,24 +160,25 @@ class Hltv:
                 self.logger.info(f"Fetching {url}, code: {response.status}")
                 if response.status == 403 or response.status == 404:
                     self.logger.debug("Got 403 forbitten")
-                    return False, await self._parse_error_handler(delay)
+                    return False, self._parse_error_handler(delay)
 
                 # checking for challenge page.
                 result = await response.text()
                 if await self._cloudflare_check(result):
-                    return False, await self._parse_error_handler(delay)
+                    return False, self._parse_error_handler(delay)
 
                 return True, result
         except (ClientProxyConnectionError, ClientResponseError, ClientOSError,
                 ServerDisconnectedError, TimeoutError, ClientHttpProxyError) as e:
             self.logger.debug(e)
-            delay = await self._parse_error_handler(delay)
+            delay = self._parse_error_handler(delay)
+            return False, delay
+        except ClientTimeout:
             return False, delay
 
     async def _fetch(self, url, delay: int = 0):
         if not self.session:
-            await self._create_session()
-
+            self._create_session()
         status = False
         try_ = 1
         result = None
@@ -188,11 +195,8 @@ class Hltv:
                 delay = result
             try_ += 1
 
-        # After Parse
-        if not self.TRUE_SESSION:
-            # Automatically close session after parse
+        if not self.ONE_TIME_SESSION:
             await self.close_session()
-
         if status:
             loop = get_running_loop()
             parsed = await loop.run_in_executor(None, partial(self._f, result))
@@ -245,7 +249,8 @@ class Hltv:
     async def get_matches(self, days: int = 1, min_rating: int = 1, live: bool = True, future: bool = True):
         """returns a list of all upcoming matches on HLTV"""
         r = await self._fetch("https://www.hltv.org/matches")
-        if not r: return
+        if not r:
+            return
 
         matches = []
 
@@ -337,6 +342,7 @@ class Hltv:
 
         except AttributeError:
             return None
+
         return matches
 
     async def get_match_info(self, match_id: str | int, team1: str, team2: str, event_title: str, stats: bool = True):
@@ -439,13 +445,13 @@ class Hltv:
                 s_t2 = scores[1].strip()
 
                 results.append({
-                            'id': match_id,
-                            'team1': team1,
-                            'team2': team2,
-                            'score1': s_t1,
-                            'score2': s_t2,
-                            'rating': rating,
-                            'event': event,
+                    'id': match_id,
+                    'team1': team1,
+                    'team2': team2,
+                    'score1': s_t1,
+                    'score2': s_t2,
+                    'rating': rating,
+                    'event': event,
                 })
 
         if regular:
@@ -481,14 +487,14 @@ class Hltv:
                         s_t2 = scores[1].strip()
 
                         results.append({
-                                    'id': match_id,
-                                    'date': date_,
-                                    'team1': team1,
-                                    'team2': team2,
-                                    'score1': s_t1,
-                                    'score2': s_t2,
-                                    'rating': rating,
-                                    'event': event,
+                            'id': match_id,
+                            'date': date_,
+                            'team1': team1,
+                            'team2': team2,
+                            'score1': s_t1,
+                            'score2': s_t2,
+                            'rating': rating,
+                            'event': event,
                         })
 
                         n += 1
@@ -503,7 +509,8 @@ class Hltv:
         match_results = []
 
         n = 0
-        for i, result in enumerate(r.find("div", {'class', 'results-holder'}).find_all("div", {'class', 'results-sublist'}), start=1):
+        for i, result in enumerate(
+                r.find("div", {'class', 'results-holder'}).find_all("div", {'class', 'results-sublist'}), start=1):
             if i > days or n > max_:
                 break
             date = self.__normalize_date(result.find("span", class_="standard-headline").text.strip())
@@ -944,12 +951,9 @@ class Hltv:
         return news
 
 
-async def test():
-    hltv = Hltv(debug=True, timeout=1, max_delay=5, true_session=True, use_proxy=True, proxy_list=['', ''])
-    print(await hltv.get('matches', 2371201, 'res-regional-series-3-latam', 'IMPERIAL', 'MIBR'))
-
-    await hltv.close_session()
-
+async def main():
+    hltv = Hltv()
+    print(await hltv.get_matches())
 
-if __name__ == "__main__":
-    asyncio.run(test())
+if __name__ == '__main__':
+    asyncio.run(main())

{hltv_async_api-0.5.2 → hltv_async_api-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hltv_async_api"
-version = "0.5.2"
+version = "0.6.0"
 authors = ["Akim Slys <akimslys2003@gmail.com>"]
 description = "Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python"
 readme = "README.md"

hltv_async_api-0.5.2/hltv_async_api/proxies.txt

@@ -1,100 +0,0 @@
-38.162.21.116:3128
-38.162.22.227:3128
-38.162.12.213:3128
-38.162.21.1:3128
-38.162.11.39:3128
-38.162.23.154:3128
-154.6.98.200:3128
-154.6.98.201:3128
-38.162.5.118:3128
-38.162.21.62:3128
-89.213.228.107:3128
-38.162.29.203:3128
-38.162.18.109:3128
-38.162.12.104:3128
-154.6.98.100:3128
-154.6.99.1:3128
-89.213.229.51:3128
-38.162.13.123:3128
-38.162.6.240:3128
-38.162.15.7:3128
-154.6.97.37:3128
-38.162.11.214:3128
-38.162.23.151:3128
-38.162.26.58:3128
-38.162.5.30:3128
-38.162.4.117:3128
-154.6.97.252:3128
-38.162.24.83:3128
-38.162.27.155:3128
-38.162.11.249:3128
-38.162.12.33:3128
-38.162.20.110:3128
-38.162.29.69:3128
-89.213.230.8:3128
-38.162.21.3:3128
-89.213.228.254:3128
-38.162.5.63:3128
-38.162.4.180:3128
-38.162.22.30:3128
-38.162.0.158:3128
-38.162.27.12:3128
-89.213.229.33:3128
-89.213.230.79:3128
-38.162.11.130:3128
-38.162.28.9:3128
-89.213.231.107:3128
-38.162.28.146:3128
-38.162.5.177:3128
-38.162.14.243:3128
-154.6.99.135:3128
-38.162.6.189:3128
-89.213.230.64:3128
-38.162.16.12:3128
-38.162.24.158:3128
-154.6.99.99:3128
-38.162.2.218:3128
-38.162.14.99:3128
-38.162.31.114:3128
-38.162.29.170:3128
-38.162.27.133:3128
-38.162.16.149:3128
-154.6.99.93:3128
-38.162.29.159:3128
-38.162.17.57:3128
-38.162.27.74:3128
-38.162.23.74:3128
-38.162.21.216:3128
-38.162.4.225:3128
-154.6.99.158:3128
-38.162.17.188:3128
-38.162.22.103:3128
-38.162.5.61:3128
-154.6.97.8:3128
-38.162.19.250:3128
-154.6.98.68:3128
-38.162.13.135:3128
-38.162.14.159:3128
-38.162.30.46:3128
-38.162.19.144:3128
-38.162.15.243:3128
-38.162.24.32:3128
-38.162.27.182:3128
-38.162.7.214:3128
-38.162.5.146:3128
-154.6.96.129:3128
-38.162.27.119:3128
-38.162.27.134:3128
-38.162.30.14:3128
-38.162.24.60:3128
-89.213.231.145:3128
-38.162.3.126:3128
-89.213.229.124:3128
-38.162.23.224:3128
-154.6.98.98:3128
-38.162.1.238:3128
-154.6.97.218:3128
-89.213.229.97:3128
-38.162.3.161:3128
-38.162.13.166:3128
-38.162.11.227:3128