missionpanel 1.3.1__tar.gz → 1.4.1__tar.gz

{missionpanel-1.3.1 → missionpanel-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: missionpanel
-Version: 1.3.1
+Version: 1.4.1
 Summary: A mission panel
 Home-page: https://github.com/yindaheng98/missionpanel
 Author: yindaheng98

{missionpanel-1.3.1 → missionpanel-1.4.1}/missionpanel/example/ttrss.py

@@ -2,6 +2,7 @@ import abc
 import asyncio
 import json
 import logging
+import traceback
 from typing import Any, AsyncGenerator, Dict, List, Union
 import httpx
 from xml.etree import ElementTree
@@ -113,7 +114,7 @@ class TTRSSSubmitter(AsyncSubmitter, metaclass=abc.ABCMeta):
                         if len(tags) > 0:
                             await self.add_tags(matchers, tags)
                     except Exception as e:
-                        self.logger.warning(f'create mission failed, error: {e}')
+                        self.logger.warning(f'create mission failed, error: {e}, traceback: {traceback.format_exc()}')
                     mission_content_queue.task_done()
 
             mission_task_ = asyncio.create_task(mission_task())

missionpanel-1.4.1/missionpanel/handler/__init__.py

@@ -0,0 +1,3 @@
+from .handler import Handler
+from .handler import AsyncHandler
+from .parallal_handler import ParallelAsyncHandler

missionpanel-1.4.1/missionpanel/handler/parallal_handler.py

@@ -0,0 +1,37 @@
+import abc
+import asyncio
+from typing import List
+
+from missionpanel.orm import Mission, Attempt
+from .handler import AsyncHandler, HandlerInterface
+
+
+class ParallelAsyncHandler(AsyncHandler, abc.ABC):
+    def __init__(self, n_parallel: int, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.task_queue = asyncio.Queue(n_parallel)
+        for i in range(n_parallel):
+            self.task_queue.put_nowait(i)
+        self.task_dict = {}
+        self.sem_report = asyncio.Semaphore(1)
+
+    async def report_attempt(self, mission: Mission, attempt: Attempt):
+        async with self.sem_report:
+            await super().report_attempt(mission, attempt)
+
+    async def run_all(self, tags: List[str]):
+        async def task(mission: Mission, attempt: Attempt, id: int):
+            attempt = await self.watchdog_mission(mission, attempt)
+            await self.task_queue.put(id)
+            return attempt
+        while True:
+            id = await self.task_queue.get()
+            async with self.sem_report:
+                mission = await self.get_mission(tags)
+                if mission is None:
+                    break
+                attempt = HandlerInterface.create_attempt(self.session, mission, self.name, self.max_time_interval)
+                self.task_dict[id] = asyncio.create_task(task(mission, attempt, id))
+        for i in self.task_dict:
+            await self.task_dict[i]
+            del self.task_dict[i]

{missionpanel-1.3.1 → missionpanel-1.4.1}/missionpanel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: missionpanel
-Version: 1.3.1
+Version: 1.4.1
 Summary: A mission panel
 Home-page: https://github.com/yindaheng98/missionpanel
 Author: yindaheng98

{missionpanel-1.3.1 → missionpanel-1.4.1}/missionpanel.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ missionpanel/example/subprocess.py
 missionpanel/example/ttrss.py
 missionpanel/handler/__init__.py
 missionpanel/handler/handler.py
+missionpanel/handler/parallal_handler.py
 missionpanel/orm/__init__.py
 missionpanel/orm/core.py
 missionpanel/orm/handler.py

{missionpanel-1.3.1 → missionpanel-1.4.1}/setup.py

@@ -12,7 +12,7 @@ package_dir = {
 
 setup(
     name='missionpanel',
-    version='1.3.1',
+    version='1.4.1',
     author='yindaheng98',
     author_email='yindaheng98@gmail.com',
     url='https://github.com/yindaheng98/missionpanel',

missionpanel-1.3.1/missionpanel/handler/__init__.py

@@ -1,2 +0,0 @@
-from .handler import Handler
-from .handler import AsyncHandler