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

libentry/argparse.py

@@ -127,18 +127,22 @@ class ArgumentParser(argparse.ArgumentParser):
         self._add_schema(name, schema)
 
     def _add_schema(self, prefix: str, schema: Type[BaseModel]):
-        for name, info in schema.model_fields.items():
+        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
 
             if nested:
@@ -228,83 +232,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/json.py

@@ -49,8 +49,8 @@ def custom_decode(d: dict):
     return d
 
 
-dump = partial(json.dump, default=custom_encode)
-dumps = partial(json.dumps, default=custom_encode)
+dump = partial(json.dump, default=custom_encode, ensure_ascii=False)
+dumps = partial(json.dumps, default=custom_encode, ensure_ascii=False)
 
 load = partial(json.load, object_hook=custom_decode)
 loads = partial(json.loads, object_hook=custom_decode)

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

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

{libentry-1.24.2.dist-info → libentry-1.24.4.dist-info}/RECORD

@@ -1,10 +1,10 @@
 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=IPe0nEII-HDB0aYAiYjrMULIN6v4n7VWSi5c8nh4UxU,7604
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
 libentry/experiment.py,sha256=ejgAHDXWIe9x4haUzIFuz1WasLY0_aD1z_vyEVGjTu8,4922
-libentry/json.py,sha256=CubUUu29h7idLaC4d66vKhjBgVHKN1rZOv-Tw2qM17k,1916
+libentry/json.py,sha256=gTjogVG6eGUMkVrjilKkpFC8ZkElGAyZIutO7mbmSzg,1956
 libentry/logging.py,sha256=IiYoCUzm8XTK1fduA-NA0FI2Qz_m81NEPV3d3tEfgdI,1349
 libentry/resource.py,sha256=qAPXF7RzRYeCM4xWft6XR3SYk7lEiQ6ymOHbpNoi0mQ,1821
 libentry/schema.py,sha256=40SOhCF_eytWOF47MWKCRHKHl_lCaQVetx1Af62PkiI,10439
@@ -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.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.24.2.dist-info/METADATA,sha256=-cTLJ9bOea34jvdvzOGMDUKaFaNCkl13WMJgl2jtn7g,1135
-libentry-1.24.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.24.2.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.24.2.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.24.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.24.2.dist-info/RECORD,,
+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,,