hltv-async-api 0.4.2__tar.gz → 0.4.3__tar.gz

{hltv_async_api-0.4.2 → hltv_async_api-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hltv_async_api
-Version: 0.4.2
+Version: 0.4.3
 Summary: Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
 Home-page: https://github.com/akimerslys/aiohltv
 Author: akimerslys
@@ -29,7 +29,13 @@ License-File: LICENSE
 * **New and modern fully async library**
 
 
-* **Supports proxy usage with huge amount of options**
+* **Huge amount of options**
+
+
+* **Supports proxy usage**
+
+
+* **Made with love <3**
 
 
 ---
@@ -206,7 +212,8 @@ pip install hltv-async-api
 
 * proxy_list: list | None = None
 
-    list of your proxies, if your proxies doesnt have any protocol you can use proxy_protocol
+    list of your proxies, if your proxies doesnt have any protocol you can use proxy_protocol.
+    Note: To add nonproxy to list just put '' to it, you can find example with ar
 
 * proxy_path: str | None = None
 
@@ -231,7 +238,7 @@ pip install hltv-async-api
 * true_session=False
   
     **(BETA)**
-    This parser automaticaly creating and clossing sessions after every use, if you want to let your session open even when parser is inactive
+    This parser automaticaly creating and clossing session after every call, if you want to let your session open even when parser is inactive
     use this method. **!! IMPORTANT YOU SHOULD CLOSE YOUR SESSION BEFORE KILLING PROGRAM**
 
     ```
@@ -265,6 +272,7 @@ if __name__ == "__main__":
 ```
 
 ****Proxy Parser****
+
 ```
 from hltv_async_api import Hltv
 
@@ -279,6 +287,101 @@ if __name__ == "__main__":
     asyncio.run(test())
 ```
 
+****Automatic parser with arq and redis****
+
+- to run type "arq PATH_TO_FILE.WorkerSettings"
+
+    ```
+    import ujson
+    import asyncio
+    from arq import cron
+    from redis.asyncio import Redis, ConnectionPool
+    
+    from hltv_async_api import Hltv
+    
+    
+    
+    async def startup(ctx):
+        ctx["hltv"] = Hltv(max_delay=5, use_proxy=True, proxy_list=[settings.PROXY_MAIN, ''], true_session=True, debug=True)
+        ctx["redis"] = redis_client = Redis(
+            connection_pool=ConnectionPool.from_url(settings.redis_url),
+        )
+        logger.success(f"Scheduler started. UTC time {datetime.utcnow()}")
+    
+    
+    async def shutdown(ctx):
+        await ctx["hltv"].close_session()
+        await ctx["redis"].close()
+    
+    
+    async def parse_matches(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        matches = await hltv.get_upcoming_matches(1, 1)
+        if matches:
+            await redis.set("matches", ujson.dumps(matches))
+        else:
+            logger.error("error parsing matches")
+    
+    async def parse_events(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        events = await hltv.get_events()
+        if events:
+            await redis.set("events", ujson.dumps(events))
+        else:
+            logger.error("error parsing events")
+    
+    
+    async def parse_top_teams(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        top_teams = await hltv.get_top_teams(30)
+        if top_teams:
+            await redis.set("top_teams", ujson.dumps(top_teams))
+        else:
+            logger.error("error parsing top teams")
+    
+    
+    async def parse_top_players(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        top_players = await hltv.get_best_players(30)
+        if top_players:
+            await redis.set("top_teams", ujson.dumps(top_players))
+        else:
+            logger.error("error parsing top players")
+    
+    
+    async def parse_last_news(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        news = await hltv.get_last_news(only_today=True, max_reg_news=4)
+        if news:
+            await redis.set("news", ujson.dumps(news))
+        else:
+            logger.error("error parsing news")
+    
+    
+    class WorkerSettings:
+        redis_settings = settings.redis_pool
+        on_startup = startup
+        on_shutdown = shutdown
+        functions = [parse_matches,
+                     parse_events,
+                     parse_top_teams,
+                     parse_top_players,
+                     parse_last_news,
+                     ]
+        cron_jobs = [
+            cron(parse_matches, minute=59),
+            cron(parse_events, hour=0, minute=0, second=0),
+            cron(parse_top_teams, day=0, hour=18, minute=1, second=30),
+            cron(parse_top_players, day=0, hour=20, minute=0, second=0),
+            cron(parse_last_news, minute=55),
+        ]
+
+    ```
 
 # Requirements:
 

{hltv_async_api-0.4.2 → hltv_async_api-0.4.3}/README.md

@@ -13,7 +13,13 @@
 * **New and modern fully async library**
 
 
-* **Supports proxy usage with huge amount of options**
+* **Huge amount of options**
+
+
+* **Supports proxy usage**
+
+
+* **Made with love <3**
 
 
 ---
@@ -190,7 +196,8 @@ pip install hltv-async-api
 
 * proxy_list: list | None = None
 
-    list of your proxies, if your proxies doesnt have any protocol you can use proxy_protocol
+    list of your proxies, if your proxies doesnt have any protocol you can use proxy_protocol.
+    Note: To add nonproxy to list just put '' to it, you can find example with ar
 
 * proxy_path: str | None = None
 
@@ -215,7 +222,7 @@ pip install hltv-async-api
 * true_session=False
   
     **(BETA)**
-    This parser automaticaly creating and clossing sessions after every use, if you want to let your session open even when parser is inactive
+    This parser automaticaly creating and clossing session after every call, if you want to let your session open even when parser is inactive
     use this method. **!! IMPORTANT YOU SHOULD CLOSE YOUR SESSION BEFORE KILLING PROGRAM**
 
     ```
@@ -249,6 +256,7 @@ if __name__ == "__main__":
 ```
 
 ****Proxy Parser****
+
 ```
 from hltv_async_api import Hltv
 
@@ -263,6 +271,101 @@ if __name__ == "__main__":
     asyncio.run(test())
 ```
 
+****Automatic parser with arq and redis****
+
+- to run type "arq PATH_TO_FILE.WorkerSettings"
+
+    ```
+    import ujson
+    import asyncio
+    from arq import cron
+    from redis.asyncio import Redis, ConnectionPool
+    
+    from hltv_async_api import Hltv
+    
+    
+    
+    async def startup(ctx):
+        ctx["hltv"] = Hltv(max_delay=5, use_proxy=True, proxy_list=[settings.PROXY_MAIN, ''], true_session=True, debug=True)
+        ctx["redis"] = redis_client = Redis(
+            connection_pool=ConnectionPool.from_url(settings.redis_url),
+        )
+        logger.success(f"Scheduler started. UTC time {datetime.utcnow()}")
+    
+    
+    async def shutdown(ctx):
+        await ctx["hltv"].close_session()
+        await ctx["redis"].close()
+    
+    
+    async def parse_matches(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        matches = await hltv.get_upcoming_matches(1, 1)
+        if matches:
+            await redis.set("matches", ujson.dumps(matches))
+        else:
+            logger.error("error parsing matches")
+    
+    async def parse_events(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        events = await hltv.get_events()
+        if events:
+            await redis.set("events", ujson.dumps(events))
+        else:
+            logger.error("error parsing events")
+    
+    
+    async def parse_top_teams(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        top_teams = await hltv.get_top_teams(30)
+        if top_teams:
+            await redis.set("top_teams", ujson.dumps(top_teams))
+        else:
+            logger.error("error parsing top teams")
+    
+    
+    async def parse_top_players(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        top_players = await hltv.get_best_players(30)
+        if top_players:
+            await redis.set("top_teams", ujson.dumps(top_players))
+        else:
+            logger.error("error parsing top players")
+    
+    
+    async def parse_last_news(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        news = await hltv.get_last_news(only_today=True, max_reg_news=4)
+        if news:
+            await redis.set("news", ujson.dumps(news))
+        else:
+            logger.error("error parsing news")
+    
+    
+    class WorkerSettings:
+        redis_settings = settings.redis_pool
+        on_startup = startup
+        on_shutdown = shutdown
+        functions = [parse_matches,
+                     parse_events,
+                     parse_top_teams,
+                     parse_top_players,
+                     parse_last_news,
+                     ]
+        cron_jobs = [
+            cron(parse_matches, minute=59),
+            cron(parse_events, hour=0, minute=0, second=0),
+            cron(parse_top_teams, day=0, hour=18, minute=1, second=30),
+            cron(parse_top_players, day=0, hour=20, minute=0, second=0),
+            cron(parse_last_news, minute=55),
+        ]
+
+    ```
 
 # Requirements:
 

{hltv_async_api-0.4.2 → hltv_async_api-0.4.3}/hltv_async_api/__init__.py

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

{hltv_async_api-0.4.2 → hltv_async_api-0.4.3}/hltv_async_api/aiohltv.py

@@ -218,19 +218,19 @@ class Hltv:
                   title: str | None = None,
                   team1: str | None = None,
                   team2: str | None = None):
-        if type == 'event':
+        if type == 'events':
             if id:
                 return await self.get_event_info(id, title)
             else:
                 return await self.get_events()
-        elif type == 'match':
+        elif type == 'matches':
             if id:
                 return await self.get_match_info(str(id), team1, team2, title)
             else:
                 return await self.get_upcoming_matches()
         elif type == 'news':
             return await self.get_last_news()
-        elif type == 'team':
+        elif type == 'teams':
             if id:
                 return await self.get_team_info(id, title)
             else:
@@ -445,7 +445,6 @@ class Hltv:
             live_matches = r.find("div", {'class', 'liveMatchesSection'}).find_all("div", {'class', 'liveMatch-container'})
         except AttributeError:
             live_matches = []
-        live_mat = []
         for live in live_matches:
             id_ = live.find('a', {'class': 'match a-reset'})['href'].split('/')[2]
             teams = live.find_all("div", class_="matchTeamName text-ellipsis")
@@ -464,20 +463,16 @@ class Hltv:
                 score_team1 = 0
                 score_team2 = 0"""
 
-            live_mat.append({
+            matches.append({
                 'id': id_,
+                'date': 'LIVE',
                 'team1': team1,
                 'team2': team2,
                 't1_id': t1_id,
                 't2_id': t2_id
             })
 
-        matches.append({
-            'date': 'LIVE',
-            'matches': live_mat,
-        })
         for date_sect in r.find_all('div', {'class': 'upcomingMatchesSection'}):
-            upc_matches = []
             date_ = date_sect.find('span', {'class': 'matchDayHeadline'}).text.split(' ')[-1]
             for match in date_sect.find_all('div', {'class': 'upcomingMatch'}):
                 teams_ = match.find_all("div", class_="matchTeamName text-ellipsis")
@@ -495,8 +490,9 @@ class Hltv:
                 except IndexError:
                     pass
 
-                upc_matches.append({
+                matches.append({
                         'id': id_,
+                        'date': date_,
                         'time': time_,
                         'team1': team1_,
                         'team2': team2_,
@@ -504,8 +500,6 @@ class Hltv:
                         't2_id': t2_id
                     })
 
-            matches.append({'date': date_, 'matches': upc_matches})
-
         return matches
     async def get_featured_events(self, max_: int = 1):
         r = await self._fetch('https://www.hltv.org/events')
@@ -590,7 +584,7 @@ class Hltv:
         return events
 
     async def get_event_info(self, event_id: str | int, event_title: str):
-        #TODO ADD PLACEC FOR PAST EVENTS? OR WINNER?
+        #TODO ADD WINNER?
 
         r = await self._fetch(f"https://www.hltv.org/events/{str(event_id)}/{event_title.replace(' ', '-')}")
         if not r:
@@ -776,6 +770,7 @@ class Hltv:
         return players
 
     async def get_last_news(self, max_reg_news=2, only_today=True, only_featured=False):
+
         r = await self._fetch('https://www.hltv.org/')
 
         today = datetime.now(tz=pytz.timezone('Europe/Copenhagen'))

{hltv_async_api-0.4.2 → hltv_async_api-0.4.3}/hltv_async_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hltv_async_api
-Version: 0.4.2
+Version: 0.4.3
 Summary: Hltv-aio An unofficial asynchronous HLTV API Wrapper for Python
 Home-page: https://github.com/akimerslys/aiohltv
 Author: akimerslys
@@ -29,7 +29,13 @@ License-File: LICENSE
 * **New and modern fully async library**
 
 
-* **Supports proxy usage with huge amount of options**
+* **Huge amount of options**
+
+
+* **Supports proxy usage**
+
+
+* **Made with love <3**
 
 
 ---
@@ -206,7 +212,8 @@ pip install hltv-async-api
 
 * proxy_list: list | None = None
 
-    list of your proxies, if your proxies doesnt have any protocol you can use proxy_protocol
+    list of your proxies, if your proxies doesnt have any protocol you can use proxy_protocol.
+    Note: To add nonproxy to list just put '' to it, you can find example with ar
 
 * proxy_path: str | None = None
 
@@ -231,7 +238,7 @@ pip install hltv-async-api
 * true_session=False
   
     **(BETA)**
-    This parser automaticaly creating and clossing sessions after every use, if you want to let your session open even when parser is inactive
+    This parser automaticaly creating and clossing session after every call, if you want to let your session open even when parser is inactive
     use this method. **!! IMPORTANT YOU SHOULD CLOSE YOUR SESSION BEFORE KILLING PROGRAM**
 
     ```
@@ -265,6 +272,7 @@ if __name__ == "__main__":
 ```
 
 ****Proxy Parser****
+
 ```
 from hltv_async_api import Hltv
 
@@ -279,6 +287,101 @@ if __name__ == "__main__":
     asyncio.run(test())
 ```
 
+****Automatic parser with arq and redis****
+
+- to run type "arq PATH_TO_FILE.WorkerSettings"
+
+    ```
+    import ujson
+    import asyncio
+    from arq import cron
+    from redis.asyncio import Redis, ConnectionPool
+    
+    from hltv_async_api import Hltv
+    
+    
+    
+    async def startup(ctx):
+        ctx["hltv"] = Hltv(max_delay=5, use_proxy=True, proxy_list=[settings.PROXY_MAIN, ''], true_session=True, debug=True)
+        ctx["redis"] = redis_client = Redis(
+            connection_pool=ConnectionPool.from_url(settings.redis_url),
+        )
+        logger.success(f"Scheduler started. UTC time {datetime.utcnow()}")
+    
+    
+    async def shutdown(ctx):
+        await ctx["hltv"].close_session()
+        await ctx["redis"].close()
+    
+    
+    async def parse_matches(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        matches = await hltv.get_upcoming_matches(1, 1)
+        if matches:
+            await redis.set("matches", ujson.dumps(matches))
+        else:
+            logger.error("error parsing matches")
+    
+    async def parse_events(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        events = await hltv.get_events()
+        if events:
+            await redis.set("events", ujson.dumps(events))
+        else:
+            logger.error("error parsing events")
+    
+    
+    async def parse_top_teams(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        top_teams = await hltv.get_top_teams(30)
+        if top_teams:
+            await redis.set("top_teams", ujson.dumps(top_teams))
+        else:
+            logger.error("error parsing top teams")
+    
+    
+    async def parse_top_players(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        top_players = await hltv.get_best_players(30)
+        if top_players:
+            await redis.set("top_teams", ujson.dumps(top_players))
+        else:
+            logger.error("error parsing top players")
+    
+    
+    async def parse_last_news(ctx):
+        hltv = ctx["hltv"]
+        redis = ctx["redis"]
+        news = await hltv.get_last_news(only_today=True, max_reg_news=4)
+        if news:
+            await redis.set("news", ujson.dumps(news))
+        else:
+            logger.error("error parsing news")
+    
+    
+    class WorkerSettings:
+        redis_settings = settings.redis_pool
+        on_startup = startup
+        on_shutdown = shutdown
+        functions = [parse_matches,
+                     parse_events,
+                     parse_top_teams,
+                     parse_top_players,
+                     parse_last_news,
+                     ]
+        cron_jobs = [
+            cron(parse_matches, minute=59),
+            cron(parse_events, hour=0, minute=0, second=0),
+            cron(parse_top_teams, day=0, hour=18, minute=1, second=30),
+            cron(parse_top_players, day=0, hour=20, minute=0, second=0),
+            cron(parse_last_news, minute=55),
+        ]
+
+    ```
 
 # Requirements:
 

{hltv_async_api-0.4.2 → hltv_async_api-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hltv_async_api"
-version = "0.4.2"
+version = "0.4.3"
 authors = [
   { name="Akim Slys", email="akimslys2003@gmail.com" },
 ]

{hltv_async_api-0.4.2 → hltv_async_api-0.4.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='hltv_async_api',
-    version='0.4.2',
+    version='0.4.3',
     author='akimerslys',
     author_email='akimslys2003@gmail.com',
     description='Hltv-aio: An unofficial asynchronous HLTV API Wrapper for Python',