fix: Don't change order of json schema object properties unless prop_order is passed, Closes abetlen#1180

abetlen · abetlen · commit d1822fed6b70 · 2024-02-13T02:44:00.000-05:00
diff --git a/llama_cpp/llama_grammar.py b/llama_cpp/llama_grammar.py
@@ -1471,12 +1471,15 @@ def visit(self, schema: Dict[str, Any], name: str) -> str:
 
         if schema_type == "object" and "properties" in schema:
             # TODO: `required` keyword
-            prop_order = self._prop_order
-            prop_pairs = sorted(
-                schema["properties"].items(),
-                # sort by position in prop_order (if specified) then by key
-                key=lambda kv: (prop_order.get(kv[0], len(prop_order)), kv[0]),
-            )
+            if self._prop_order:
+                prop_order = self._prop_order
+                prop_pairs = sorted(
+                    schema["properties"].items(),
+                    # sort by position in prop_order (if specified) then by key
+                    key=lambda kv: (prop_order.get(kv[0], len(prop_order)), kv[0]),
+                )
+            else:
+                prop_pairs = schema["properties"].items()
 
             rule = '"{" space'
             for i, (prop_name, prop_schema) in enumerate(prop_pairs):
