Selaa lähdekoodia

feat(module): Upgrade pydantic done

huangrunheng 2 vuotta sitten
vanhempi
sitoutus
9c7cf13ae1

+ 11 - 9
module/config/config_model.py

@@ -312,21 +312,22 @@ class ConfigModel(ConfigBase):
                 item["default"] = value["default"]
                 item["default"] = value["default"]
                 item["value"] = jsons[key] if key in jsons else value["default"]
                 item["value"] = jsons[key] if key in jsons else value["default"]
                 item["type"] = value["type"] if "type" in value else "enum"
                 item["type"] = value["type"] if "type" in value else "enum"
-                if 'allOf' in value:
-                    # list
-                    enum_key = re.search(r"/([^/]+)$", value['allOf'][0]['$ref']).group(1)
+                if '$ref' in value:  # list
+                    enum_key = re.search(r"/([^/]+)$", value['$ref']).group(1)
                     item["enumEnum"] = definitions[enum_key]["enum"]
                     item["enumEnum"] = definitions[enum_key]["enum"]
-                # TODO: 最大值最小值
+                # if 'allOf' in value:
+                #     enum_key = re.search(r"/([^/]+)$", value['allOf'][0]['$ref']).group(1)
+                #     item["enumEnum"] = definitions[enum_key]["enum"]
                 result.append(item)
                 result.append(item)
             return result
             return result
 
 
-        schema = task.schema()
-        print(schema)
+        schema = task.model_json_schema(mode='serialization')
+        # print(schema)
         groups = extract_groups(schema)
         groups = extract_groups(schema)
 
 
         result: dict[str, list] = {}
         result: dict[str, list] = {}
         for key, value in task.model_dump().items():
         for key, value in task.model_dump().items():
-            result[key] = merge_value(groups[key], value, schema["defs"])
+            result[key] = merge_value(groups[key], value, schema["$defs"])
 
 
         return result
         return result
 
 
@@ -421,5 +422,6 @@ if __name__ == "__main__":
         print(e)
         print(e)
         c = ConfigModel()
         c = ConfigModel()
 
 
-    # c.save()
-    print(c.script_task('Duel'))
+    import json
+    sch = json.dumps(c.script_task('Duel'), indent=4)
+    print(sch)

+ 18 - 1
tasks/Component/config_base.py

@@ -1,6 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # @author runhey
 # github https://github.com/runhey
 # github https://github.com/runhey
+import re
 from typing import Any
 from typing import Any
 from collections.abc import Callable, Generator
 from collections.abc import Callable, Generator
 from datetime import timedelta, time, datetime
 from datetime import timedelta, time, datetime
@@ -19,6 +20,22 @@ def format_timedelta(tdelta: timedelta):
     minutes, seconds = divmod(rem, 60)
     minutes, seconds = divmod(rem, 60)
     return f"{days:02d} {hours:02d}:{minutes:02d}:{seconds:02d}"
     return f"{days:02d} {hours:02d}:{minutes:02d}:{seconds:02d}"
 
 
+def datadelta_validator(v: Any) -> timedelta:
+    if isinstance(v, str):
+        try:
+            pattern = r'(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})'
+            match = re.match(pattern, v)
+            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 v
+
 def datetime_validator(v: Any) -> datetime:
 def datetime_validator(v: Any) -> datetime:
     if isinstance(v, str):
     if isinstance(v, str):
         return datetime.fromisoformat(v)
         return datetime.fromisoformat(v)
@@ -35,7 +52,7 @@ MultiLine = Annotated[str,
 
 
 
 
 TimeDelta = Annotated[timedelta,
 TimeDelta = Annotated[timedelta,
-                      BeforeValidator(lambda v: isinstance(v, str) or isinstance(v, timedelta)),
+                      BeforeValidator(datadelta_validator),
                       PlainSerializer(format_timedelta, return_type=str),
                       PlainSerializer(format_timedelta, return_type=str),
                       WithJsonSchema({'type': 'time_delta'}, mode='serialization'),]
                       WithJsonSchema({'type': 'time_delta'}, mode='serialization'),]
 
 

+ 12 - 3
tasks/Component/config_scheduler.py

@@ -17,10 +17,19 @@ class Scheduler(ConfigBase):
 
 
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
-    s = Scheduler(success_interval='00 00:00:10', float_time='00:01:00', next_run='2023-01-01 00:00:10')
+    dict_s = {
+        "enable": False,
+        "next_run": "2026-07-19T14:15:37",
+        "priority": 5,
+        "success_interval": "10 00:00:01",
+        "failure_interval": "10 00:00:01",
+        "server_update": "09:03:00",
+        "float_time": "02:00:05"
+    }
+    s = Scheduler(**dict_s)
     print(s.model_dump())
     print(s.model_dump())
-    schema = s.model_json_schema(mode='validation')
+    # schema = s.model_json_schema(mode='validation')
     import json
     import json
-    print(str(schema))
+    # print(str(schema))