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

libentry/argparse.py

@@ -126,7 +126,7 @@ class ArgumentParser(argparse.ArgumentParser):
         self.schema_dict[name] = (schema, default)
         self._add_schema(name, schema)
 
-    def _add_schema(self, prefix: str, schema: Type[BaseModel]):
+    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():
@@ -145,13 +145,21 @@ class ArgumentParser(argparse.ArgumentParser):
                         nested = True
                         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
                 )

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

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

{libentry-1.24.4.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=IPe0nEII-HDB0aYAiYjrMULIN6v4n7VWSi5c8nh4UxU,7604
+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.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.24.4.dist-info/METADATA,sha256=Ow5czGQ7Hsbo-4JjT7CudKXtbw06qcGkgaNKcH8I8sg,1135
-libentry-1.24.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.24.4.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.24.4.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.24.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.24.4.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,,