libentry 1.13__py3-none-any.whl → 1.15__py3-none-any.whl

libentry/schema.py

@@ -11,9 +11,10 @@ __all__ = [
 ]
 
 import enum
-from dataclasses import dataclass
+from dataclasses import asdict, dataclass, is_dataclass
 from inspect import signature
-from typing import Any, Iterable, List, Literal, Mapping, MutableMapping, NoReturn, Optional, Sequence, Union, get_args, \
+from typing import Any, Dict, Iterable, List, Literal, Mapping, MutableMapping, NoReturn, Optional, Sequence, Union, \
+    get_args, \
     get_origin
 
 from pydantic import BaseModel, Field, create_model
@@ -27,6 +28,7 @@ class SchemaField(BaseModel):
     is_required: bool = Field(True)
     title: str = Field()
     description: Optional[str] = Field(None)
+    metadata: Dict[str, Any] = Field(default_factory=dict)
 
 
 class Schema(BaseModel):
@@ -85,7 +87,7 @@ def _parse_dict(context: ParseContext):
             key_type = "str"
             value_type = parse_type(dict_args[1], context.schemas)
             if isinstance(value_type, list):
-                raise TypeError("\"Union\" cannot be used as the type of list elements.")
+                raise TypeError("\"Union\" cannot be used as the type of dict elements.")
             return f"Dict[{key_type},{value_type}]"
         else:
             return "Dict"
@@ -127,18 +129,25 @@ def _parse_base_model(context: ParseContext):
             fields = origin.model_fields
             assert isinstance(fields, Mapping)
             for name, field in fields.items():
-
                 try:
-                    schema.fields.append(SchemaField(
+                    default = field.default if field.default is not PydanticUndefined else None
+                    title = field.title
+                    if title is None:
+                        title = "".join(word.capitalize() for word in name.split("_"))
+                    schema_field = SchemaField(
                         name=name,
                         type=parse_type(field.annotation, context.schemas),
-                        default=field.default if field.default is not PydanticUndefined else None,
+                        default=default,
                         is_required=field.is_required(),
-                        title="".join(word.capitalize() for word in name.split("_")),
+                        title=title,
                         description=field.description
-                    ))
+                    )
                 except TypeError as e:
                     raise TypeError(f"{name}: {str(e)}")
+                for md in field.metadata:
+                    if is_dataclass(md):
+                        schema_field.metadata.update(asdict(md))
+                schema.fields.append(schema_field)
             context.schemas[model_name] = schema
 
         return model_name
@@ -177,13 +186,13 @@ def generic_parser(fn):
 
 @generic_parser
 def _parse_any(context: ParseContext):
-    if context.origin is Any:
+    if context.origin is Any or str(context.origin) == str(Any):
         return "Any"
 
 
 @generic_parser
 def _parse_union(context: ParseContext):
-    if context.origin is Union:
+    if context.origin is Union or str(context.origin) == str(Union):
         return [
             parse_type(arg, context.schemas)
             for arg in get_args(context.annotation)
@@ -192,7 +201,7 @@ def _parse_union(context: ParseContext):
 
 @generic_parser
 def _parse_literal(context: ParseContext):
-    if context.origin is Literal:
+    if context.origin is Literal or str(context.origin) == str(Literal):
         enum_args = get_args(context.annotation)
         return f"Enum[{','.join(map(str, enum_args))}]"
 

libentry/service/flask.py

@@ -149,8 +149,9 @@ class FlaskWrapper:
         params = signature(fn).parameters
         if len(params) == 1:
             for name, value in params.items():
-                if issubclass(value.annotation, BaseModel):
-                    self.input_schema = value.annotation
+                annotation = value.annotation
+                if isinstance(annotation, type) and issubclass(annotation, BaseModel):
+                    self.input_schema = annotation
 
     def __call__(self):
         if request.method == "POST":
@@ -161,6 +162,11 @@ class FlaskWrapper:
             return self.app.error(f"Unsupported method \"{request.method}\".")
 
         if self.input_schema is not None:
+            # Note that "input_schema is not None" means:
+            # (1) The function has only one argument;
+            # (2) The arguments is a BaseModel.
+            # In this case, the request data can be directly validated as a "BaseModel" and
+            # subsequently passed to the function as a single object.
             try:
                 input_data = self.input_schema.model_validate(input_json)
                 response = self.fn(input_data)
@@ -169,6 +175,8 @@ class FlaskWrapper:
                     raise e
                 return self.app.error(self.dumper.dump_error(e))
         else:
+            # The function has multiple arguments, and the request data bundle them as a single object.
+            # So, they should be unpacked before pass to the function.
             try:
                 response = self.fn(**input_json)
             except Exception as e:

{libentry-1.13.dist-info → libentry-1.15.dist-info}/METADATA

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

{libentry-1.13.dist-info → libentry-1.15.dist-info}/RECORD

@@ -6,18 +6,18 @@ libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
 libentry/experiment.py,sha256=ejgAHDXWIe9x4haUzIFuz1WasLY0_aD1z_vyEVGjTu8,4922
 libentry/json.py,sha256=1-Kv5ZRb5dBrOTU84n6sZtYZV3xE-O6wEt_--ynbSaU,1209
 libentry/logging.py,sha256=IiYoCUzm8XTK1fduA-NA0FI2Qz_m81NEPV3d3tEfgdI,1349
-libentry/schema.py,sha256=ZlQnqUrL0YQ5koZnka7RNfOSzaH5llQ5XhQI6ig02xk,7629
+libentry/schema.py,sha256=BO7EE7i43Cb4xn_OLsBM-HDwWOT6V5fPs91Am3QqnNQ,8178
 libentry/server.py,sha256=gYPoZXd0umlDYZf-6ZV0_vJadg3YQvnLDc6JFDJh9jc,1503
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
-libentry/service/flask.py,sha256=_5bU9A44CmsRQFGMOuaUEZpJqVs08FAblVcCIphCQNY,11986
+libentry/service/flask.py,sha256=0sYFI8TJY65AEs-gNJdoKqg8_eWk4rSOfKMPauzHQLc,12550
 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.13.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.13.dist-info/METADATA,sha256=5FKTWuTb2otAHMY4pZThJ21OlZyFv2kp402tUNolqyI,791
-libentry-1.13.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-libentry-1.13.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.13.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.13.dist-info/RECORD,,
+libentry-1.15.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.15.dist-info/METADATA,sha256=Vlvcl_kB5qp_0xM_eLNJykdEzv0slsqh7LitUa-dpo4,791
+libentry-1.15.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+libentry-1.15.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.15.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.15.dist-info/RECORD,,