Explorar el Código

feat(scheduler): add next run

runhey hace 3 años
padre
commit
9e69712d2a

+ 1 - 0
module/config/config.py

@@ -213,3 +213,4 @@ if __name__ == '__main__':
     print(config.get_next())
 
 
+

+ 20 - 6
module/config/config_model.py

@@ -10,6 +10,7 @@ from module.config.utils import *
 from module.logger import logger
 
 # 导入配置的Python文件
+from tasks.Component.config_base import ConfigBase
 from tasks.Script.config import Script
 from tasks.Restart.config import Restart
 from tasks.GlobalGame.config import GlobalGame
@@ -28,7 +29,7 @@ from tasks.RealmRaid.config import RealmRaid
 
 
 
-class ConfigModel(BaseModel):
+class ConfigModel(ConfigBase):
     config_name: str = "oas"
     script: Script = Field(default_factory=Script)
     restart: Restart = Field(default_factory=Restart)
@@ -111,7 +112,18 @@ class ConfigModel(BaseModel):
         if task_gui is None:
             logger.error(f'{task} is no inexistence')
             return ''
-        return task_gui.schema_json()
+
+        schema2 = task_gui.schema()
+        # https://github.com/pydantic/pydantic/discussions/5687
+        if 'definitions' in schema2:
+            if 'Scheduler' in schema2['definitions']:
+                if 'properties' in schema2['definitions']['Scheduler']:
+                    properties = schema2['definitions']['Scheduler']['properties']
+                    if 'success_interval' in properties:
+                        properties['success_interval']['type'] = 'string'
+                    if 'failure_interval' in properties:
+                        properties['failure_interval']['type'] = 'string'
+        return json.dumps(schema2)
 
     def gui_task(self, task: str) -> str:
         """
@@ -166,9 +178,11 @@ if __name__ == "__main__":
     except ValidationError as e:
         print(e)
         c = ConfigModel()
-    # c.write_json('oas1', c.dict())
-    # c.write_json('oas1', c.schema())
-    # for key, value in c.dict().items():
-    #     print(ConfigModel.type(key))
+
+    c.gui_args('Nian')
+    print(c.gui_task('Nian'))
+    print(c.gui_task('AreaBoss'))
+    print(c.dict()['nian']['scheduler']['success_interval'])
+    c.save()
 
 

+ 58 - 0
module/config/utils.py

@@ -184,3 +184,61 @@ def convert_to_underscore(text: str) -> str:
 
     return result
 
+def get_server_last_update(daily_trigger):
+    """
+    Args:
+        daily_trigger (list[str], str): [ "00:00", "12:00", "18:00",]
+
+    Returns:
+        datetime.datetime
+    """
+    if isinstance(daily_trigger, str):
+        daily_trigger = daily_trigger.replace(' ', '').split(',')
+
+    diff = server_time_offset()
+    local_now = datetime.now()
+    trigger = []
+    for t in daily_trigger:
+        h, m = [int(x) for x in t.split(':')]
+        future = local_now.replace(hour=h, minute=m, second=0, microsecond=0) + diff
+        s = (future - local_now).total_seconds() % 86400 - 86400
+        future = local_now + timedelta(seconds=s)
+        trigger.append(future)
+    update = sorted(trigger)[-1]
+    return update
+
+
+def nearest_future(future, interval=120):
+    """
+    Get the neatest future time.
+    Return the last one if two things will finish within `interval`.
+
+    Args:
+        future (list[datetime.datetime]):
+        interval (int): Seconds
+
+    Returns:
+        datetime.datetime:
+    """
+    future = [datetime.fromisoformat(f) if isinstance(f, str) else f for f in future]
+    future = sorted(future)
+    next_run = future[0]
+    for finish in future:
+        if finish - next_run < timedelta(seconds=interval):
+            next_run = finish
+
+    return next_run
+
+
+
+def dict_to_kv(dictionary, allow_none=True):
+    """
+    Args:
+        dictionary: Such as `{'path': 'Scheduler.ServerUpdate', 'value': True}`
+        allow_none (bool):
+
+    Returns:
+        str: Such as `path='Scheduler.ServerUpdate', value=True`
+    """
+    return ', '.join([f'{k}={repr(v)}' for k, v in dictionary.items() if allow_none or v is not None])
+

+ 2 - 2
script.py

@@ -443,6 +443,6 @@ class Script:
 
 if __name__ == "__main__":
     script = Script("oas1")
-    # print(script.get_next_task())
-    script.run("AreaBoss")
+    print(script.get_next_task())
+    # script.run("AreaBoss")
     # script.run('RealmRaid')

+ 2 - 1
tasks/AreaBoss/config.py

@@ -5,10 +5,11 @@ from pydantic import BaseModel, Field
 
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 from tasks.AreaBoss.config_boss import Boss
 
 
-class AreaBoss(BaseModel):
+class AreaBoss(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     boss: Boss = Field(default_factory=Boss)

+ 1 - 1
tasks/AreaBoss/script_task.py

@@ -166,7 +166,7 @@ class ScriptTask(GeneralBattle, AreaBossAssets):
 
         # 退出
         self.go_back()
-        self.set_next_run(task='AreaBoss')
+        self.set_next_run(task='AreaBoss', success=True)
 
         # 以抛出异常的形式结束
         raise TaskEnd

+ 0 - 67
tasks/CoinChallenge/assets.py

@@ -1,67 +0,0 @@
-from module.atom.image import RuleImage
-from module.atom.click import RuleClick
-from module.atom.long_click import RuleLongClick
-from module.atom.swipe import RuleSwipe
-from module.atom.ocr import RuleOcr
-from module.atom.list import RuleList
-
-# This file was automatically generated by module/dev_tools/assets_extract.py.
-# Don't modify it manually.
-class CoinChallengeAssets: 
-
-
-	# Image Rule Assets
-	# description 
-	I_NEW1 = RuleImage(roi_front=(157,240,70,79), roi_back=(41,185,279,207), threshold=0.8, method="Template matching", file="./tasks/CoinChallenge/res/res_new1.png")
-	# description 
-	I_NEW2 = RuleImage(roi_front=(362,243,100,100), roi_back=(803,101,100,100), threshold=0.8, method="Template matching", file="./tasks/CoinChallenge/res/res_new2.png")
-	# desc55 
-	I_NEW3 = RuleImage(roi_front=(568,212,240,220), roi_back=(0,0,100,100), threshold=0.9, method="Template matching", file="./tasks/CoinChallenge/res/res_new3.png")
-
-
-	# Click Rule Assets
-	# description 
-	C_NEW1 = RuleClick(roi_front=(268,268,100,100), roi_back=(614,214,100,100), name="new1")
-	# description 
-	C_NEW2 = RuleClick(roi_front=(171,236,100,100), roi_back=(554,225,100,100), name="new2")
-	# desc444n 
-	C_NEW3 = RuleClick(roi_front=(180,150,100,100), roi_back=(596,247,100,100), name="new3")
-
-
-	# Long Click Rule Assets
-	# description 
-	L_NEW1 = RuleLongClick(roi_front=(208,151,100,100), roi_back=(542,279,100,100), duration=1500, name="new1")
-	# description 
-	L_NEW2 = RuleLongClick(roi_front=(355,191,100,100), roi_back=(526,323,100,100), duration=1500, name="new2")
-	# de66666n 
-	L_NEW3 = RuleLongClick(roi_front=(112,156,100,100), roi_back=(469,200,100,100), duration=1000, name="new3")
-
-
-	# Ocr Rule Assets
-	# Ocr-description 
-	O_NEW_FULL = RuleOcr(roi=(255,129,628,100), area=(637,418,100,100), mode="Full", method="Default", keyword="探索", name="new_full")
-	# Ocr-description 
-	O_NEW_SINGLE_V = RuleOcr(roi=(564,255,105,159), area=(0,0,100,100), mode="Single", method="Default", keyword="式神育成", name="new_single_v")
-	# Ocr-description 
-	O_NEW_SINGLE_H = RuleOcr(roi=(78,19,143,63), area=(314,169,100,100), mode="Single", method="Default", keyword="式神育成", name="new_single_h")
-	# Ocr-description 
-	O_DIGIT = RuleOcr(roi=(434,173,25,43), area=(0,0,100,100), mode="Digit", method="Default", keyword="", name="digit")
-	# Ocr-description 
-	O_DIGIT_COUNTER = RuleOcr(roi=(1134,6,100,56), area=(0,0,100,100), mode="DigitCounter", method="Default", keyword="", name="digit_counter")
-	# Ocr-description 
-	O_DURATION = RuleOcr(roi=(923,256,100,46), area=(0,0,100,100), mode="Duration", method="Default", keyword="育成_结界卡剩余时间", name="duration")
-	# Ocr-description 
-	O_NEW_DUR_00 = RuleOcr(roi=(848,624,76,37), area=(0,0,100,100), mode="Duration", method="Default", keyword="", name="new_dur_00")
-
-
-	# Swipe Rule Assets
-	# description 
-	S_NEW1 = RuleSwipe(roi_front=(253,212,100,100), roi_back=(652,292,100,100), mode="default", name="new1")
-	# description 
-	S_NEW2 = RuleSwipe(roi_front=(265,272,100,100), roi_back=(622,338,100,100), mode="default", name="new2")
-	# description 
-	S_NEW3 = RuleSwipe(roi_front=(198,160,100,100), roi_back=(626,305,100,100), mode="default", name="new3")
-	# description 
-	S_NEW4 = RuleSwipe(roi_front=(150,145,100,100), roi_back=(535,199,100,100), mode="vector", name="new4")
-
-

BIN
tasks/CoinChallenge/res/res_new1.png


BIN
tasks/CoinChallenge/res/res_new2.png


BIN
tasks/CoinChallenge/res/res_new3.png


+ 0 - 1
tasks/CoinChallenge/res/test.json

@@ -1 +0,0 @@
-[{"itemName":"new1","imageName":"res_new1.png","roiFront":"157,240,70,79","roiBack":"41,185,279,207","method":"Template matching","threshold":0.8,"description":"description"},{"itemName":"new2","imageName":"res_new2.png","roiFront":"362,243,100,100","roiBack":"803,101,100,100","method":"Template matching","threshold":0.8,"description":"description"},{"itemName":"new3","imageName":"res_new3.png","roiFront":"568,212,240,220","roiBack":"0,0,100,100","method":"Template matching","threshold":0.9,"description":"desc55"}]

+ 0 - 20
tasks/CoinChallenge/res/test_click.json

@@ -1,20 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "268,268,100,100",
-        "roiBack": "614,214,100,100",
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "171,236,100,100",
-        "roiBack": "554,225,100,100",
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "180,150,100,100",
-        "roiBack": "596,247,100,100",
-        "description": "desc444n"
-    }
-]

+ 0 - 23
tasks/CoinChallenge/res/test_long_click.json

@@ -1,23 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "208,151,100,100",
-        "roiBack": "542,279,100,100",
-        "duration": 1500,
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "355,191,100,100",
-        "roiBack": "526,323,100,100",
-        "duration": 1500,
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "112,156,100,100",
-        "roiBack": "469,200,100,100",
-        "duration": 1000,
-        "description": "de66666n"
-    }
-]

+ 0 - 65
tasks/CoinChallenge/res/test_ocr.json

@@ -1,65 +0,0 @@
-[
-  {
-    "itemName": "new_full",
-    "roiFront": "255,129,628,100",
-    "roiBack": "637,418,100,100",
-    "mode": "Full",
-    "method": "Default",
-    "keyword": "探索",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "new_single_v",
-    "roiFront": "564,255,105,159",
-    "roiBack": "0,0,100,100",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "式神育成",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "new_single_h",
-    "roiFront": "78,19,143,63",
-    "roiBack": "314,169,100,100",
-    "mode": "Single",
-    "method": "Default",
-    "keyword": "式神育成",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "digit",
-    "roiFront": "434,173,25,43",
-    "roiBack": "0,0,100,100",
-    "mode": "Digit",
-    "method": "Default",
-    "keyword": "",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "digit_counter",
-    "roiFront": "1134,6,100,56",
-    "roiBack": "0,0,100,100",
-    "mode": "DigitCounter",
-    "method": "Default",
-    "keyword": "",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "duration",
-    "roiFront": "923,256,100,46",
-    "roiBack": "0,0,100,100",
-    "mode": "Duration",
-    "method": "Default",
-    "keyword": "育成_结界卡剩余时间",
-    "description": "Ocr-description"
-  },
-  {
-    "itemName": "new_dur_00",
-    "roiFront": "848,624,76,37",
-    "roiBack": "0,0,100,100",
-    "mode": "Duration",
-    "method": "Default",
-    "keyword": "",
-    "description": "Ocr-description"
-  }
-]

+ 0 - 30
tasks/CoinChallenge/res/test_swipe.json

@@ -1,30 +0,0 @@
-[
-    {
-        "itemName": "new1",
-        "roiFront": "253,212,100,100",
-        "roiBack": "652,292,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new2",
-        "roiFront": "265,272,100,100",
-        "roiBack": "622,338,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new3",
-        "roiFront": "198,160,100,100",
-        "roiBack": "626,305,100,100",
-        "mode": "default",
-        "description": "description"
-    },
-    {
-        "itemName": "new4",
-        "roiFront": "150,145,100,100",
-        "roiBack": "535,199,100,100",
-        "mode": "vector",
-        "description": "description"
-    }
-]

+ 30 - 0
tasks/Component/config_base.py

@@ -0,0 +1,30 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+
+from datetime import timedelta
+from pydantic import BaseModel, datetime_parse
+
+
+
+def format_timedelta(tdelta: timedelta):
+    days = tdelta.days
+    hours, rem = divmod(tdelta.seconds, 3600)
+    minutes, seconds = divmod(rem, 60)
+    return f"{days:02d} {hours:02d}:{minutes:02d}:{seconds:02d}"
+
+class TimeDelta(timedelta):
+    def __str__(self):
+        return format_timedelta(self)
+
+    def __repr__(self):
+        return format_timedelta(self)
+
+class ConfigBase(BaseModel):
+    class Config:
+        json_encoders = {
+            TimeDelta: format_timedelta
+        }
+
+
+

+ 33 - 5
tasks/Component/config_scheduler.py

@@ -1,17 +1,21 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+import re
 from enum import Enum
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
-class Scheduler(BaseModel):
+from tasks.Component.config_base import ConfigBase, TimeDelta
+
+class Scheduler(ConfigBase):
     enable: bool = Field(default=False, description='enable_help')
     next_run: datetime = Field(default="2023-01-01 00:00:00", description='next_run_help')
     priority: int = Field(default=5, description='priority_help')
-    interval_days: int = Field(default=1, description='interval_days_help')
-    interval_hours: int = Field(default=0, description='interval_hours_help')
-    interval_minutes: int = Field(default=0, description='interval_minutes_help')
+
+    success_interval: TimeDelta = Field(default=TimeDelta(days=1), description='success_interval_help')
+    failure_interval: TimeDelta = Field(default=TimeDelta(days=1), description='failure_interval_help')
+    server_update: time = Field(default=time(hour=6, minute=0, second=0), description='server_update_help')
 
     @validator('next_run', pre=True, always=True)
     def parse_next_run(cls, value):
@@ -22,3 +26,27 @@ class Scheduler(BaseModel):
                 raise ValueError('Invalid next_run value. Expected format: YYYY-MM-DD HH:MM:SS')
         return value
 
+    @validator('success_interval', 'failure_interval', pre=True)
+    def parse_interval(cls, value):
+        if isinstance(value, str):
+            try:
+                pattern = r'(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})'
+                match = re.match(pattern, value)
+                if match:
+                    days = int(match.group(1))
+                    hours = int(match.group(2))
+                    minutes = int(match.group(3))
+                    seconds = int(match.group(4))
+                    return TimeDelta(days=days, hours=hours, minutes=minutes, seconds=seconds)
+                return TimeDelta(days=1, hours=0, minutes=0, seconds=0)
+            except ValueError:
+                raise ValueError('Invalid interval value. Expected format: seconds')
+        return value
+
+
+if __name__ == "__main__":
+    s = Scheduler(success_interval='1 2:3:4')
+    print(s.json())
+    print(s.dict())
+
+

+ 1 - 0
tasks/DemonEncounter/config.py

@@ -2,4 +2,5 @@
 # @author runhey
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
+from tasks.Component.config_base import ConfigBase
 

+ 2 - 1
tasks/EternitySea/config.py

@@ -4,7 +4,8 @@
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-class EternitySea(BaseModel):
+class EternitySea(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 2 - 1
tasks/ExperienceYoukai/config.py

@@ -4,7 +4,8 @@
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
-class ExperienceYoukai(BaseModel):
+class ExperienceYoukai(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
 

+ 2 - 2
tasks/FallenSun/config.py

@@ -4,8 +4,8 @@
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
-
-class FallenSun(BaseModel):
+class FallenSun(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
 

+ 1 - 0
tasks/General/config.py

@@ -3,5 +3,6 @@
 # github https://github.com/runhey
 
 from pydantic import BaseModel, ValidationError, validator, Field
+from tasks.Component.config_base import ConfigBase
 
 from module.logger import logger

+ 1 - 1
tasks/GlobalGame/config.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, Field
 
 from tasks.GlobalGame.config_emergency import Emergency
-
+from tasks.Component.config_base import ConfigBase
 
 class GlobalGame(BaseModel):
     emergency: Emergency = Field(default_factory=Emergency)

+ 2 - 1
tasks/GoldYoukai/config.py

@@ -4,7 +4,8 @@
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
 
-class GoldYoukai(BaseModel):
+class GoldYoukai(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 1 - 1
tasks/Hunt/config.py

@@ -4,4 +4,4 @@
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
-
+from tasks.Component.config_base import ConfigBase

+ 3 - 2
tasks/Nian/config.py

@@ -1,11 +1,12 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+from datetime import timedelta
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
-
-class Nian(BaseModel):
+class Nian(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
 

+ 2 - 1
tasks/Orochi/config.py

@@ -4,7 +4,8 @@
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
-class Orochi(BaseModel):
+class Orochi(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
 

+ 2 - 2
tasks/OrochiMoans/config.py

@@ -4,8 +4,8 @@
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
-
-class OrochiMoans(BaseModel):
+class OrochiMoans(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
 

+ 2 - 2
tasks/RealmRaid/config.py

@@ -6,7 +6,7 @@ from enum import Enum
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
-
+from tasks.Component.config_base import ConfigBase
 
 class RaidMode(str, Enum):
     NORMAL = 'retreat_four_attack_nine'
@@ -22,7 +22,7 @@ class RaidConfig(BaseModel):
     attack_number: AttackNumber = Field(title='Attack Number', default=AttackNumber.ALL,
                                         description='')
 
-class RealmRaid(BaseModel):
+class RealmRaid(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     raid_config: RaidConfig = Field(default_factory=RaidConfig)
     general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)

+ 1 - 1
tasks/RealmRaid/script_task.py

@@ -78,7 +78,7 @@ class ScriptTask(GeneralBattle, GameUi, RealmRaidAssets):
         # 点击左上角的关闭
         self.explore_home()
 
-        self.set_next_run(task='RealmRaid')
+        self.set_next_run(task='RealmRaid', success=True)
         raise TaskEnd
 
 

+ 3 - 2
tasks/Restart/config.py

@@ -3,8 +3,9 @@
 # github https://github.com/runhey
 from pydantic import BaseModel, Field
 
-from tasks.Restart.config_scheduler import Scheduler
+from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
-class Restart(BaseModel):
+class Restart(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
 

+ 14 - 10
tasks/Restart/config_scheduler.py

@@ -8,17 +8,21 @@ from pydantic import BaseModel, ValidationError, validator, Field
 from module.logger import logger
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
-    next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=0,
-                          description='default 0')
-    command: str = Field(default='Restart',
-                         description='none')
+    enable: bool = Field(default=True, description='none')
+    next_run: datetime = Field(default="2023-01-01 00:00:00", description='无需手动修改')
+    priority: int = Field(default=0, description='重启的优先级最高,数值为0,保持默认即可')
+
     success_interval: float = Field(default=0,
                                     description='none')
     failure_interval: float = Field(default=0,
                                     description='none')
-    server_update: time = Field(default="00:00",
-                                description='none')
+    server_update: time = Field(default="00:00", description='none')
+
+    @validator('next_run', pre=True, always=True)
+    def parse_next_run(cls, value):
+        if isinstance(value, str):
+            try:
+                return datetime.fromisoformat(value)
+            except ValueError:
+                raise ValueError('Invalid next_run value. Expected format: YYYY-MM-DD HH:MM:SS')
+        return value

+ 27 - 0
tasks/Restart/script_task.py

@@ -0,0 +1,27 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+
+
+from tasks.Restart.config_scheduler import Scheduler
+from module.logger import logger
+from tasks.Restart.assets import RestartAssets
+from tasks.base_task import BaseTask
+from module.exception import TaskEnd
+
+
+
+
+class ScriptTask(BaseTask):
+
+    def run(self) -> None:
+        raise TaskEnd('ScriptTask end')
+
+
+
+
+
+
+
+
+

+ 2 - 2
tasks/Sougenbi/config.py

@@ -4,8 +4,8 @@
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
+from tasks.Component.config_base import ConfigBase
 
-
-class Sougenbi(BaseModel):
+class Sougenbi(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
 

+ 52 - 11
tasks/base_task.py

@@ -17,11 +17,12 @@ from module.ocr.base_ocr import OcrMode, OcrMethod
 from module.logger import logger
 from module.base.timer import Timer
 from module.config.config import Config
+from module.config.utils import get_server_next_update, nearest_future, dict_to_kv
 from module.device.device import Device
 from tasks.GlobalGame.assets import GlobalGameAssets
 from tasks.GlobalGame.config_emergency import FriendInvitation, WhenNetworkAbnormal, WhenNetworkError
 
-from module.exception import GameStuckError
+from module.exception import GameStuckError, ScriptError
 
 
 
@@ -58,7 +59,6 @@ class BaseTask(GlobalGameAssets):
         if self.friend_timer and self.friend_timer.reached():
             self.friend_timer.reset()
             invite = self.appear(self.I_ACCEPT)
-            logger.info(f"Find friend invitation")
             # 如果是全部接受
             if invite and self.config.global_game.emergency.friend_invitation == FriendInvitation.ACCEPT:
                 # 如果是接受邀请
@@ -401,28 +401,69 @@ class BaseTask(GlobalGameAssets):
                 x1, y1, x2, y2 = target.swipe_pos(after=after)
                 self.device.swipe(p1=(x1, y1), p2=(x2, y2))
 
-    def set_next_run(self, task: str, finish: bool = False) -> None:
+    def set_next_run(self, task: str, finish: bool = False,
+                     success: bool=None, server: bool=None, target: timedelta=None) -> None:
         """
         设置下次运行时间  当然这个也是可以重写的
+        :param target: 可以自定义的下次运行时间
+        :param server: delay to nearest Scheduler.ServerUpdate
+        :param success: 判断是成功的还是失败的时间间隔
         :param task: 任务名称,大驼峰的
         :param finish: 是完成任务后的时间为基准还是开始任务的时间为基准
         :return:
         """
+
+        # 任务预处理
+        if not task:
+            task = self.config.task.command
         task = convert_to_underscore(task)
         task_object = getattr(self.config.model, task, None)
         if not task_object:
             logger.warning(f'No task named {task}')
             return
+        scheduler = getattr(task_object, 'scheduler', None)
+        if not scheduler:
+            logger.warning(f'No scheduler in {task}')
+            return
 
+        # 任务开始时间
         if finish:
             start_time = datetime.now()
         else:
             start_time = self.start_time
-        delta = timedelta(days=task_object.scheduler.interval_days,
-                          hours=task_object.scheduler.interval_hours,
-                          minutes=task_object.scheduler.interval_minutes, )
-        next_run = start_time + delta
-        next_run.replace(microsecond=0)
-
-        task_object.scheduler.next_run = next_run
-        self.config.save()
+
+        # 依次判断是否有自定义的下次运行时间
+        run = []
+        if success is not None:
+            interval = (
+                scheduler.success_interval
+                if success
+                else scheduler.failure_interval
+            )
+            run.append(start_time + interval)
+        if server is not None:
+            if server:
+                server = scheduler.server_update
+                run.append(get_server_next_update(server))
+        if target is not None:
+            target = [target] if not isinstance(target, list) else target
+            target = nearest_future(target)
+            run.append(target)
+        # 排序
+        if len(run):
+            run = min(run).replace(microsecond=0)
+            kv = dict_to_kv(
+                {
+                    "success": success,
+                    "server_update": server,
+                    "target": target,
+                },
+                allow_none=False,
+            )
+            logger.info(f"Delay task `{task}` to {run} ({kv})")
+            scheduler.next_run = run
+            self.config.save()
+        else:
+            raise ScriptError(
+                "Missing argument in delay_next_run, should set at least one"
+            )