update

Author: hsz1273327

schema_entry/entrypoint.py

@@ -179,8 +179,8 @@ def with_schema(self, schemaObj: Union[str, dict, PydanticModelLike]) -> Union[s
             schemaObjSchemaType = cast(SchemaType, schemaObj)
             self.schema = schemaObjSchemaType
         else:
-            schema = cast(SchemaType, schemaObj.model_json_schema())
-            self.schema = pydantic_schema_to_protocol(schema)
+            schema = schemaObj.model_json_schema()
+            self.schema = cast(SchemaType, pydantic_schema_to_protocol(schema))
             self._name = schemaObj.__name__.lower()
             self.__doc__ = schemaObj.__doc__
         return schemaObj
@@ -215,7 +215,8 @@ def __call__(self, argv: Sequence[str]) -> Optional[Any]:
                 description=self.__doc__,
                 usage=self.usage,
                 formatter_class=argparse.RawDescriptionHelpFormatter)
-            return self.pass_args_to_sub(parser, argv)
+            self.pass_args_to_sub(parser, argv)
+
         else:
             parser = argparse.ArgumentParser(
                 prog=self.prog,

schema_entry/utils.py

@@ -220,7 +220,7 @@ def parse_schema_as_cmd(key: str, schema: PropertyType, parser: argparse.Argumen
 
 def _remove_sigal_allOf(x: Dict[str, Any]) -> Dict[str, Any]:
     info: Dict[str, Any] = {}
-    if x.get("allOf"):
+    if x.get("allOf") and isinstance(x['allOf'], list) :
         if len(x["allOf"]) == 1:
             info.update(**x["allOf"][0])
             del x["allOf"]
@@ -233,7 +233,7 @@ def _remove_sigal_allOf(x: Dict[str, Any]) -> Dict[str, Any]:
 
 
 def remove_sigal_allOf(d: Dict[str, Any]) -> Dict[str, Any]:
-    if d.get('properties'):
+    if d.get('properties') and isinstance(d['properties'], dict):
         for key, value in d.get('properties').items():
             info = _remove_sigal_allOf(value)
             d['properties'][key] = info
@@ -252,9 +252,7 @@ def remove_defs_interference(d: Dict[str, Any]) -> Dict[str, Any]:
 
 def replace_refs(d: Dict[str, Any]) -> Dict[str, Any]:
     info = jsonref.replace_refs(d)
-    print(info)
     if info.get("$defs"):
-        print("remove $defs")
         del info["$defs"]
     return info