Procházet zdrojové kódy

feat(module): save team flow

runhey před 3 roky
rodič
revize
7c3bdec323

+ 12 - 2
module/config/config.py

@@ -8,6 +8,7 @@ import threading
 
 from datetime import datetime, timedelta
 from cached_property import cached_property
+from threading import Lock
 
 from module.base.filter import Filter
 from module.config.config_updater import ConfigUpdater
@@ -119,6 +120,10 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
             # logger.error(f'can not ask this variable {name}')
             return None  # 或者抛出异常,或者返回其他默认值
 
+    @cached_property
+    def lock_config(self) -> Lock:
+        return Lock()
+
     def gui_args(self, task: str) -> str:
         """
         获取给gui显示的参数
@@ -315,10 +320,15 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         if server and scheduler.server_update != time(hour=9):
             next_run = parse_tomorrow_server(scheduler.server_update)
 
+
+        # 保证线程安全的
+        self.lock_config.acquire()
+        try:
+            scheduler.next_run = next_run
+        finally:
+            self.lock_config.release()
         # 设置
         logger.attr(f'{task}.scheduler.next_run', next_run)
-        # 保证线程安全的
-        scheduler.next_run = next_run
         self.save()
 
     @cached_property

+ 30 - 6
module/team_flow/host.py

@@ -49,13 +49,21 @@ class Host(Mqtt, Player):
         # 其他人上线,就广播自己的策略出去
         if 'type' in data:
             logger.info(f'Player {player} is online')
+            self.q_publish.put(['Strategy', self.publish_data()])
         else:
             # 如果是其他人像
             pass
 
-
     def on_last_will(self, player: str, data: dict):
-        pass
+        if player not in self.players:
+            logger.warning(f'Player {player} is not in players')
+            return
+        self.players.remove(player)
+        logger.info(f'Player {player} is offline')
+        self._config_to_player()
+        self._update_strategy()
+        self._player_to_config()
+        self.q_publish.put(['Strategy', self.publish_data()])
 
     def on_task_start(self, player: str, data: dict):
         pass
@@ -63,7 +71,7 @@ class Host(Mqtt, Player):
     def on_strategy(self, player: str, data: dict):
         pass
 
-    def update_multi_tasks(self):
+    def _config_to_player(self):
         """
         作为主角, 更新自身的多人任务的缓存
         也就是从  config -> multi_tasks
@@ -125,9 +133,25 @@ class Host(Mqtt, Player):
                                                         role=role,
                                                         limit_count=limit_count)
 
-    def update_strategy(self):
+    def _player_to_config(self):
+        for key, value in self.multi_tasks.items():
+            if key == 'orochi':
+                self.config.task_delay(task='Orochi', target=value.next_run)
+            elif key == 'fallen_sun':
+                self.config.task_delay(task='FallenSun', target=value.next_run)
+            elif key == 'eternity_sea':
+                self.config.task_delay(task='EternitySea', target=value.next_run)
+            elif key == 'evo_zone':
+                self.config.task_delay(task='EvoZone', target=value.next_run)
+            elif key == 'exploration':
+                # TODO 等待探索完成
+                pass
+            else:
+                continue
+
+    def _update_strategy(self):
         """
-        更新策略
+        更新策略:
         :return:
         """
         pass
@@ -139,7 +163,7 @@ if __name__ == '__main__':
     host = Host(Config('oas1'))
     sleep(20)
     # 更新config -> multi_tasks -> publish_data
-    host.update_multi_tasks()
+    host._config_to_player()
     host.q_publish.put(['Strategy' ,host.publish_data()])
     host.q_publish.put(['Strategy' ,host.publish_data()])
     host.q_publish.put(['Strategy' ,host.publish_data()])

+ 8 - 1
module/team_flow/mqtt.py

@@ -75,7 +75,7 @@ class Mqtt:
         # publish FirstNotice
         self.publish("FirstNotice", {"type": "join"})
         # 开启一个线程来处理消息
-        self.mqtt_timer = Timer(60)
+        self.mqtt_timer = Timer(30)
         self.mqtt_timer.start()
         self.mqtt_thread = Thread(target=self.mqtt_loop, name='mqtt_loop', daemon=True)
         self.mqtt_thread.start()
@@ -124,12 +124,19 @@ class Mqtt:
             if not self.mqtt_timer.reached():
                 continue
             self.mqtt_timer.reset()
+            publish_strategy_msg = None
             while not self.q_publish.empty():
                 try:
                     topic, msg = self.q_publish.get(block=False)
                 except Exception as e:
                     continue
+                if topic == 'Strategy':
+                    publish_strategy_msg = msg
+                    continue
                 self.publish(topic, msg)
+            if publish_strategy_msg:
+                # 先进先出 保证只发送一次最新的
+                self.publish('Strategy', publish_strategy_msg)
 
 
 

+ 65 - 2
module/team_flow/task.py

@@ -2,12 +2,13 @@
 # @author runhey
 # github https://github.com/runhey
 from time import sleep
-from datetime import datetime, time
+from datetime import datetime, time, timedelta
 from random import randint
 
-
 from module.config.config import Config
 
+from tasks.Component.config_base import TimeDelta
+
 
 class Task:
     def __init__(self,
@@ -57,7 +58,69 @@ class Task:
         else:
             raise TypeError(f'role must be str, not {type(role)}')
 
+    # ----------------------------------------------------------------------------------------------------------------------
+    # 对于host来进行操作的函数
+    def u(self) -> float:
+        """
+        效用函数
+        :return:
+        """
+        if self.role == 'leader':
+            return self.r_leader() - self.r_leader()
+        elif self.role == 'member':
+            return self.r_member() - self.c_member()
+
+    def r_leader(self, tasks: list['Task']) -> float:
+        """
+        收益函数
+        :param tasks: 在小组内的启用的同一任务列表
+        :return:
+        """
+        result = 0
+        for task in tasks:
+            if task.role == 'leader':
+                pass
+
+        return result
+
+    def c_leader(self) -> float:
+        """
+        成本函数
+        :return:
+        """
+
+    def r_member(self) -> float:
+        """
+        收益函数
+        :return:
+        """
+
+    def c_member(self) -> float:
+        """
+        成本函数
+        :return:
+        """
+
+
+def t_diff(before: Task, after: Task) -> timedelta:
+    """
+    计算两个任务之间的时间差
+    :param before:
+    :param after:
+    :return: 单位是秒
+    """
+    return (after.next_run - before.next_run).total_seconds()
 
 
+if __name__ == '__main__':
+    host = Task(next_run=datetime.fromisoformat('2023-09-13 18:46:23'),
+                limit_time=time.fromisoformat('00:30:00'),
+                target_run=datetime.fromisoformat('2023-09-13 18:46:23'),
+                team_task=True, role='leader', limit_count=0)
 
+    test1 = Task(next_run=datetime.fromisoformat('2023-09-13 18:44:23'),
+                 limit_time=time.fromisoformat('00:30:00'),
+                 target_run=datetime.fromisoformat('2023-09-13 18:46:23'),
+                 team_task=True, role='leader', limit_count=0)
 
+    print(t_diff(host, test1))