Просмотр исходного кода

feat(flutter): Do save all argument

huangrunheng 3 лет назад
Родитель
Сommit
aa0a06a028

+ 57 - 6
module/config/config_model.py

@@ -13,7 +13,7 @@ from module.config.utils import *
 from module.logger import logger
 
 # 导入配置的Python文件
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Exploration.config import Exploration
 from tasks.RyouToppa.config import RyouToppa
 from tasks.Script.config import Script
@@ -281,12 +281,15 @@ class ConfigModel(ConfigBase):
             logger.warning(f'{task} is no inexistence')
             return {}
 
-        def extract_groups(sch):
-            # 从schema 中提取未解析的group的数据
+        def properties_groups(sch) -> dict:
             properties = {}
             for key, value in sch["properties"].items():
                 properties[key] = re.search(r"/([^/]+)$", value['$ref']).group(1)
-            print(f'输出的组是{properties}')
+            return properties
+
+        def extract_groups(sch):
+            # 从schema 中提取未解析的group的数据
+            properties = properties_groups(sch)
 
             result = {}
             for key, value in properties.items():
@@ -300,7 +303,7 @@ class ConfigModel(ConfigBase):
             for key, value in groups["properties"].items():
                 item = {}
                 item["name"] = key
-                item["title"] = value["title"] if "title" in value else inflection.humanize(key)
+                item["title"] = value["title"] if "title" in value else inflection.underscore(key)
                 if "description" in value:
                     item["description"] = value["description"]
                 item["default"] = value["default"]
@@ -326,10 +329,58 @@ class ConfigModel(ConfigBase):
 
         result: dict[str, list] = {}
         for key, value in task.dict().items():
-            result[inflection.humanize(key)] = merge_value(groups[key], value, schema["definitions"])
+            result[key] = merge_value(groups[key], value, schema["definitions"])
 
         return result
 
+    def script_set_arg(self, task: str, group: str, argument: str, value) -> bool:
+        # 验证参数
+        task = convert_to_underscore(task)
+        group = convert_to_underscore(group)
+        argument = convert_to_underscore(argument)
+
+
+        # pandtic验证
+        if isinstance(value, str) and len(value) == 8:
+            try:
+                value = datetime.strptime(value, '%H:%M:%S').time()
+            except ValueError:
+                pass
+        if isinstance(value, str) and len(value) == 11:
+            try:
+                date_time = datetime.strptime(value, '%d %H:%M:%S')
+                value = TimeDelta(days=date_time.day, hours=date_time.hour, minutes=date_time.minute, seconds=date_time.second)
+            except ValueError:
+                pass
+        if isinstance(value, str) and len(value) == 19:
+            try:
+                value = datetime.strptime(value, '%Y-%m-%d %H:%M:%S')
+            except ValueError:
+                pass
+        if isinstance(value, str) and value == 'true':
+            value = True
+        if isinstance(value, str) and value == 'false':
+            value = False
+
+        task_object = getattr(self, task, None)
+        group_object = getattr(task_object, group, None)
+        argument_object = getattr(group_object, argument, None)
+        print(group_object)
+        print(argument_object)
+
+        if argument_object is None:
+            logger.error(f'Set arg {task}.{group}.{argument}.{value} failed')
+            return False
+
+        # 设置参数
+        try:
+            setattr(group_object, argument, value)
+            logger.info(f'Set arg {self.config_name}.{task}.{group}.{argument}.{value}')
+            self.save()  # 我是没有想到什么方法可以使得属性改变自动保存的
+            return True
+        except ValidationError as e:
+            logger.error(e)
+            return False
 
 
 

+ 1 - 0
module/config/utils.py

@@ -166,6 +166,7 @@ def convert_to_underscore(text: str) -> str:
     if '_' in text:
         # If text already contains underscore, assume it's in the correct format
         return text
+    text = text.replace(' ', '')
 
     result = ''
     for i, char in enumerate(text):

+ 31 - 5
module/server/script_router.py

@@ -4,12 +4,15 @@
 import asyncio
 from fastapi import APIRouter, HTTPException
 from fastapi.responses import StreamingResponse
+from datetime import datetime
 from module.config.config import Config
 
 from module.logger import logger
 from module.server.main_manager import MainManager
 from module.server.script_process import ScriptProcess
 
+from tasks.Component.config_base import TimeDelta
+
 
 script_app = APIRouter()
 mm = MainManager()
@@ -64,12 +67,35 @@ async def script_task(script_name: str, task: str):
         raise Exception(f'[{script_name}] script file does not exist')
     return mm.config_cache.model.script_task(task)
 
-@script_app.put('/{script_name}/{task}/{group}/{argument}/value/{value}')
-async def script_task(script_name: str, task: str, group: str, argument: str, value):
-    if not mm.ensure_config_cache(task):
+@script_app.put('/{script_name}/{task}/{group}/{argument}/value')
+async def script_task(script_name: str, task: str, group: str, argument: str, types: str ,value):
+    if not mm.ensure_config_cache(script_name):
         raise HTTPException(status_code=404, detail=f'[{script_name}] script file does not exist')
-    mm.config_cache.set_task_args(task, group, argument, value)
-    return
+    try:
+        match types:
+            case 'integer':
+                value = int(value)
+            case 'number':
+                value = float(value)
+            case 'boolean':
+                value = bool(value)
+            case 'string':
+                pass
+            case 'date_time':
+                value = datetime.strptime(value, '%Y-%m-%d %H:%M:%S')
+            case 'time_delta':
+                # strptime 是个好东西,但是不能解析00的天数
+                day = int(value[0:1])
+                date_time = datetime.strptime(value[3:], '%H:%M:%S')
+                value = TimeDelta(days=day, hours=date_time.hour, minutes=date_time.minute, seconds=date_time.second)
+            case 'time':
+                value = datetime.strptime(value, '%H:%M:%S').time()
+            case _:pass
+    except Exception as e:
+        # 类型不正确
+        raise HTTPException(status_code=400, detail=f'Argument type error: {e}')
+    mm.config_cache.model.config_name = script_name
+    return mm.config_cache.model.script_set_arg(task, group, argument, value)
 
 # --------------------------------------  SSE  --------------------------------------
 @script_app.get('/{script_name}/state')

+ 1 - 1
tasks/Component/config_base.py

@@ -66,7 +66,7 @@ class Time(time):
 
     @classmethod
     def validate(cls, value):
-        print('validate', value)
+        print(f' Time validate: {value} type: {type(value)}')
         if isinstance(value, str):
             hour, minute, second = map(int, value.split(":"))
             return cls(hour, minute, second)

+ 0 - 1
tasks/Hunt/config.py

@@ -15,4 +15,3 @@ class HuntConfig(BaseModel):
 class Hunt(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     hunt_config: HuntConfig = Field(default_factory=HuntConfig)
-    exit_battle: bool = Field(default=False, description='exit_battle_help')