Update patch_gradio_jsonschema.py

patch_gradio_jsonschema.py

@@ -1,13 +1,9 @@
 # patch_gradio_jsonschema.py
 """
-<<<<<<< HEAD
-Runtime monkeypatch to make gradio_client JSON Schema handling robust to boolean schemas.
-Import this BEFORE importing gradio or gradio_client (so do it at the top of your entrypoint).
-=======
 Robust runtime monkeypatch for gradio_client JSON Schema handling.
 Import this BEFORE importing gradio or gradio_client.
-This version uses *args/**kwargs wrappers to be compatible with varying signatures.
->>>>>>> 6c8c1495789d779c0c6e4ad7f97c161874800b94
+This version uses *args/**kwargs wrappers to be compatible with varying signatures
+and avoids merge-conflict artefacts.
 """
 
 try:
@@ -24,44 +20,29 @@ def _bool_to_safe_schema(b: bool):
     else:
         return {"type": "___boolean_schema_false___"}
 
-<<<<<<< HEAD
-def _wrap_get_type(orig):
-    def wrapper(schema):
-        if _is_bool_schema(schema):
-            schema = _bool_to_safe_schema(schema)
-        return orig(schema)
-    return wrapper
-
-def _wrap_json_schema_to_python_type(orig):
-    def wrapper(schema, defs=None):
-        if _is_bool_schema(schema):
-            schema = _bool_to_safe_schema(schema)
-        return orig(schema, defs)
-=======
 def _wrap_function_coercing_schema(orig):
     """
-    Wraps functions that take a schema as their first positional argument.
-    If the first arg is a boolean, coerce it to a safe dict before calling orig.
+    Wraps functions that accept a schema as first positional arg.
+    Coerces boolean schemas into safe dicts before calling the original.
     Works for functions with signature like f(schema), f(schema, defs), etc.
     """
     def wrapper(*args, **kwargs):
+        # If first positional arg is a boolean schema, replace it
         if len(args) >= 1 and _is_bool_schema(args[0]):
             new_first = _bool_to_safe_schema(args[0])
             new_args = (new_first,) + args[1:]
             return orig(*new_args, **kwargs)
-        # also handle schema passed as keyword 'schema'
+        # If schema passed as keyword arg
         if "schema" in kwargs and _is_bool_schema(kwargs["schema"]):
             kw = dict(kwargs)
             kw["schema"] = _bool_to_safe_schema(kwargs["schema"])
             return orig(*args, **kw)
         return orig(*args, **kwargs)
-    # copy metadata if available
     try:
         wrapper.__name__ = getattr(orig, "__name__", "wrapped")
         wrapper.__doc__ = getattr(orig, "__doc__", "")
     except Exception:
         pass
->>>>>>> 6c8c1495789d779c0c6e4ad7f97c161874800b94
     return wrapper
 
 def apply_patch():
@@ -70,47 +51,27 @@ def apply_patch():
         try:
             import gradio_client.utils as _gc_utils
         except Exception:
-<<<<<<< HEAD
-            return False
-
-    if hasattr(_gc_utils, "get_type"):
-        _gc_utils.get_type = _wrap_get_type(_gc_utils.get_type)
-
-    if hasattr(_gc_utils, "_json_schema_to_python_type"):
-        _gc_utils._json_schema_to_python_type = _wrap_json_schema_to_python_type(
-            _gc_utils._json_schema_to_python_type
-        )
-
-    if hasattr(_gc_utils, "json_schema_to_python_type"):
-        orig_public = _gc_utils.json_schema_to_python_type
-        def public_wrapper(schema, defs=None):
-            if _is_bool_schema(schema):
-                schema = _bool_to_safe_schema(schema)
-            return orig_public(schema, defs)
-        _gc_utils.json_schema_to_python_type = public_wrapper
-
-    return True
-
-apply_patch()
-# diagnostic print
-try:
-    print("patch_gradio_jsonschema applied")
-=======
-            # nothing to patch yet
             return False
 
-    # Patch get_type if present (it expects a schema arg)
+    # Patch get_type if present
     if hasattr(_gc_utils, "get_type"):
+        # preserve original if not already saved
+        if not hasattr(_gc_utils, "_orig_get_type"):
+            _gc_utils._orig_get_type = _gc_utils.get_type
         _gc_utils.get_type = _wrap_function_coercing_schema(_gc_utils.get_type)
 
-    # Patch internal conversion if present
+    # Patch internal _json_schema_to_python_type if present
     if hasattr(_gc_utils, "_json_schema_to_python_type"):
+        if not hasattr(_gc_utils, "_orig__json_schema_to_python_type"):
+            _gc_utils._orig__json_schema_to_python_type = _gc_utils._json_schema_to_python_type
         _gc_utils._json_schema_to_python_type = _wrap_function_coercing_schema(
             _gc_utils._json_schema_to_python_type
         )
 
-    # Patch public helper if present; use varargs to keep signature compatibility
+    # Patch public helper json_schema_to_python_type if present
     if hasattr(_gc_utils, "json_schema_to_python_type"):
+        if not hasattr(_gc_utils, "_orig_json_schema_to_python_type"):
+            _gc_utils._orig_json_schema_to_python_type = _gc_utils.json_schema_to_python_type
         _gc_utils.json_schema_to_python_type = _wrap_function_coercing_schema(
             _gc_utils.json_schema_to_python_type
         )
@@ -120,9 +81,8 @@ try:
 # apply at import time
 apply_patch()
 
-# diagnostic log so you can see in Space runtime logs
+# small diagnostic print visible in runtime logs
 try:
-    print("patch_gradio_jsonschema applied (robust)")
->>>>>>> 6c8c1495789d779c0c6e4ad7f97c161874800b94
+    print("patch_gradio_jsonschema applied (clean)")
 except Exception:
-    pass
+    pass