From d9d7dbe813a01e3a65056617605387a7a61cc61e Mon Sep 17 00:00:00 2001 From: Franz Louis Cesista Date: Sat, 4 May 2024 13:51:13 +0800 Subject: [PATCH] improve names of util funcs --- outlines/fsm/json_schema.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/outlines/fsm/json_schema.py b/outlines/fsm/json_schema.py index a6e3da2de..91f3ac7b6 100644 --- a/outlines/fsm/json_schema.py +++ b/outlines/fsm/json_schema.py @@ -96,7 +96,7 @@ def build_regex_from_schema( return to_regex(resolver, content, whitespace_pattern) -def is_null_type(instance: dict): +def _is_null_type(instance: dict): if "type" in instance and (instance["type"] == "null" or instance["type"] is None): return True if "const" in instance and ( @@ -106,9 +106,9 @@ def is_null_type(instance: dict): return False -def any_of_list_has_null_type(any_of_list: list[dict[str, str]]): - for subinstance in any_of_list: - if is_null_type(subinstance): +def _has_null_type(instance_list: list[dict]): + for instance in instance_list: + if _is_null_type(instance): return True return False @@ -133,12 +133,10 @@ def optimize_schema(instance): subinstance_type == "array" and subinstance.get("minItems", 0) == 0 ): new_optional_keys.add(key) - elif "anyOf" in subinstance and any_of_list_has_null_type( - subinstance["anyOf"] - ): + elif "anyOf" in subinstance and _has_null_type(subinstance["anyOf"]): any_of_list = subinstance.pop("anyOf") filtered_any_of_list = list( - filter(lambda d: is_null_type(d), any_of_list) + filter(lambda d: _is_null_type(d), any_of_list) ) if len(filtered_any_of_list) == 0: keys_to_remove.add(key)