missionpanel 1.4.3__tar.gz → 1.5.0__tar.gz

{missionpanel-1.4.3 → missionpanel-1.5.0}/PKG-INFO

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

{missionpanel-1.4.3 → missionpanel-1.5.0}/missionpanel/example/subprocess.py

@@ -38,4 +38,6 @@ class SubprocessAsyncHandlerInterface(AsyncHandler, abc.ABC):
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE)
         await asyncio.gather(self.__readline_info(proc.stdout), self.__readline_debug(proc.stderr))
-        return (await proc.wait()) == 0
+        return_code = await proc.wait()
+        self.getLogger().info('return | %d' % return_code)
+        return return_code == 0

{missionpanel-1.4.3 → missionpanel-1.5.0}/missionpanel/handler/handler.py

@@ -5,7 +5,7 @@ from typing import List, Optional, Tuple, Union
 from sqlalchemy.orm import Session, Query
 from sqlalchemy.ext.asyncio import AsyncSession
 from missionpanel.orm import Mission, Tag, MissionTag, Attempt
-from sqlalchemy import select, func, distinct, case, Select
+from sqlalchemy import select, func, distinct, Select, cast, Text
 
 
 class HandlerInterface(abc.ABC):
@@ -25,13 +25,14 @@ class HandlerInterface(abc.ABC):
     def query_todo_missions(tags: List[str]) -> Select[Tuple[Mission]]:
         return (
             HandlerInterface.query_missions_by_tag(tags)
-            .outerjoin(Attempt)
-            .group_by(Mission.id)
-            .having(func.count(
-                case(((  # see if Attempt is finished or working on the Mission
+            .outerjoin(Attempt, onclause=(
+                (cast(Attempt.content, Text) == cast(Mission.content, Text)) & (
+                    # see if Attempt is finished or working on the Mission
                     Attempt.success.is_(True) |  # have finished handler
                     (Attempt.last_update_time + Attempt.max_time_interval >= datetime.datetime.now())  # have working handler
-                ), 0), else_=None)) <= 0)  # get those Missions that have no finished or working Attempt
+                )
+            ))
+            .where(Attempt.id == None)
         )
 
     @staticmethod

{missionpanel-1.4.3 → missionpanel-1.5.0}/missionpanel.egg-info/PKG-INFO

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

{missionpanel-1.4.3 → missionpanel-1.5.0}/setup.py

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