libentry 1.24.3__py3-none-any.whl → 1.24.5__py3-none-any.whl

libentry/argparse.py

@@ -126,28 +126,40 @@ class ArgumentParser(argparse.ArgumentParser):
         self.schema_dict[name] = (schema, default)
         self._add_schema(name, schema)
 
-    def _add_schema(self, prefix: str, schema: Type[BaseModel]):
-        for name, info in schema.model_fields.items():
+    def _add_schema(self, prefix: str, schema: Type[BaseModel], instance: Optional[BaseModel] = None):
+        model_fields = schema.model_fields
+        assert isinstance(model_fields, dict)
+        for name, info in model_fields.items():
             anno = info.annotation
             nested = False
 
             if isinstance(anno, type) and issubclass(anno, BaseModel):
                 nested = True
 
-            if get_origin(anno) is Union and any(issubclass(t, BaseModel) for t in get_args(anno)):
-                for t in get_args(anno):
-                    if issubclass(t, BaseModel):
+            if get_origin(anno) is Union:
+                # Here we just choose the first BaseModel.
+                # So you should avoid define a Union contains multiple BaseModel types.
+                for sub_anno in get_args(anno):
+                    if isinstance(sub_anno, type) and issubclass(sub_anno, BaseModel):
+                        anno = sub_anno
                         nested = True
-                        anno = t
                         break
 
+            default_value = info.default
+            if isinstance(instance, schema):
+                default_value = getattr(instance, name, None)
+
             if nested:
-                self._add_schema(f"{prefix}.{name}", anno)
+                self._add_schema(
+                    f"{prefix}.{name}",
+                    schema=anno,
+                    instance=default_value
+                )
             else:
                 self.add_argument(
                     f"--{prefix}.{name}",
                     type=literal_eval,
-                    default=DefaultValue(info.default),
+                    default=DefaultValue(default_value),
                     # required=info.is_required(),
                     help=info.description
                 )
@@ -228,83 +240,3 @@ def _list_field_names(obj):
         return [*obj.model_fields]
     else:
         return [obj.__dict__]
-
-# T = TypeVar('T')
-#
-#
-# class ArgumentParser(argparse.ArgumentParser):
-#     PATTERN_ARG_NAME = re.compile(r"^--?[a-zA-Z][\w\-.]*$")
-#     PATTERN_ARG_PREFIX = re.compile(r"^--?")
-#     DATACLASS_OBJ_KEY = 'target'
-#
-#     def __init__(self):
-#         super().__init__()
-#         self.obj_dict = {}
-#
-#     def add_argument(self, *args, **kwargs):
-#         if self.DATACLASS_OBJ_KEY in kwargs:
-#             obj = kwargs[self.DATACLASS_OBJ_KEY]
-#             for prefix in args:
-#                 self.obj_dict[prefix] = obj
-#             return obj
-#         elif len(args) >= 2 and is_dataclass(args[-1]) and all(isinstance(arg, str) for arg in args[:-1]):
-#             obj = args[-1]
-#             for prefix in args[:-1]:
-#                 self.obj_dict[prefix] = obj
-#             return obj
-#         else:
-#             return super().add_argument(*args, **kwargs)
-#
-#     def add_dataclass(self, prefix, d: Union[Type[T], T]) -> T:
-#         assert is_dataclass(d)
-#         if isinstance(d, type):
-#             d = d()
-#         self.obj_dict[prefix] = d
-#         return d
-#
-#     def parse_args(self, args=None, namespace=None, parse_unknown=False):
-#         args, unknown_args = super().parse_known_args()
-#
-#         d = {}
-#         name = None
-#         values = []
-#         for arg in unknown_args:
-#             if arg.startswith('-'):
-#                 if self.PATTERN_ARG_NAME.match(arg):
-#                     if name is not None:
-#                         d[name] = values[0] if len(values) == 1 else values
-#                         values = []
-#                     name = self.PATTERN_ARG_PREFIX.sub("", arg).replace('-', '_')
-#                 else:
-#                     value = literal_eval(arg)
-#                     if isinstance(value, str):
-#                         logger.warning(f'The value "{arg}" may be incorrect.')
-#                     if name is not None:
-#                         values.append(value)
-#             else:
-#                 values.append(literal_eval(arg))
-#         if name is not None:
-#             d[name] = values[0] if len(values) == 1 else values
-#
-#         for name, value in d.items():
-#             sections = name.split('.')
-#             if len(sections) == 1:
-#                 args.__dict__[name] = value
-#             else:
-#                 prefix = sections[0]
-#                 members = sections[1:-1]
-#                 attr = sections[-1]
-#                 if prefix not in self.obj_dict:
-#                     raise RuntimeError(f'There is no {prefix} argument.')
-#                 obj = self.obj_dict[prefix]
-#
-#                 for member in members:
-#                     if not hasattr(obj, member):
-#                         raise RuntimeError(f'There is no {prefix} argument {name}.')
-#                     obj = getattr(obj, member)
-#
-#                 if not hasattr(obj, attr):
-#                     raise RuntimeError(f'There is no {prefix} argument {name}.')
-#                 setattr(obj, sections[-1], value)
-#
-#         return args

{libentry-1.24.3.dist-info → libentry-1.24.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: libentry
-Version: 1.24.3
+Version: 1.24.5
 Summary: Entries for experimental utilities.
 Home-page: https://github.com/XoriieInpottn/libentry
 Author: xi

{libentry-1.24.3.dist-info → libentry-1.24.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 libentry/__init__.py,sha256=ko2YBIIx5H3dD0tedBkialzJGEDczFaP_PZmT1cIlak,148
 libentry/api.py,sha256=UkXdBv9oqQhaSESRReLWEPj8venBUoCBppIg-FAXqKA,24146
-libentry/argparse.py,sha256=NxzXV-jBN51ReZsNs5aeyOfzwYQ5A5nJ95rWoa-FYCs,10415
+libentry/argparse.py,sha256=j_wv7rBE_9TFgxnR6zJtdUkugKP8vOwwIMkL-RaHRsw,7901
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
 libentry/experiment.py,sha256=ejgAHDXWIe9x4haUzIFuz1WasLY0_aD1z_vyEVGjTu8,4922
@@ -22,10 +22,10 @@ libentry/service/list.py,sha256=ElHWhTgShGOhaxMUEwVbMXos0NQKjHsODboiQ-3AMwE,1397
 libentry/service/running.py,sha256=FrPJoJX6wYxcHIysoatAxhW3LajCCm0Gx6l7__6sULQ,5105
 libentry/service/start.py,sha256=mZT7b9rVULvzy9GTZwxWnciCHgv9dbGN2JbxM60OMn4,1270
 libentry/service/stop.py,sha256=wOpwZgrEJ7QirntfvibGq-XsTC6b3ELhzRW2zezh-0s,1187
-libentry-1.24.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.24.3.dist-info/METADATA,sha256=_Jhwomm28Zsl3Jw1NHslnqvQe_eUW-dLe0j0SrGNHnI,1135
-libentry-1.24.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.24.3.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.24.3.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.24.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.24.3.dist-info/RECORD,,
+libentry-1.24.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.24.5.dist-info/METADATA,sha256=Up8a5KSfalbtpaRZs1s8fo9uNDbYU7GfdEacO49v2QM,1135
+libentry-1.24.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.24.5.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.24.5.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.24.5.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.24.5.dist-info/RECORD,,