fix: prevent type wrappers for primitive types

Author: dhruv-ahuja

logfire/_internal/json_schema.py

@@ -293,9 +293,13 @@ def _pydantic_root_model_schema(obj: Any, seen: set[int]) -> JsonDict:
 
     if isinstance(root, type(None)):
         return {'type': 'null'}
+
+    schema: JsonDict = {}
+
     # return a complex schema to ensure JSON parsing for simple objects inside RootModel since they get an
     # extra layer of JSON encoding and to handle subclass representations correctly
-    elif isinstance(root, (str, bool, int, float)):
+    primitive_types = (str, bool, int, float)
+    if isinstance(root, primitive_types):
         datatype = None
         if isinstance(root, str):
             type_ = 'string'
@@ -309,11 +313,11 @@ def _pydantic_root_model_schema(obj: Any, seen: set[int]) -> JsonDict:
             type_ = 'number'
             datatype = 'number'
 
-        return {
-            'type': type_,
-            'x-python-datatype': datatype,
-            'title': root.__class__.__name__,
-        }
+        schema = {'type': type_, 'x-python-datatype': datatype}
+        if root.__class__ not in primitive_types:
+            schema['title'] = root.__class__.__name__
+
+        return schema
 
     return create_json_schema(obj.root, seen)  # type: ignore
 

tests/test_console_exporter.py

@@ -1094,11 +1094,11 @@ class Order(IntEnum):
             '│ with_model=Model(',
             "│                name='with_model',",
             '│            )',
-            "│ with_str=str('with_str')",
+            "│ with_str='with_str'",
             "│ with_str_inner='with_str'",
-            '│ with_int=int(-150)',
+            '│ with_int=-150',
             '│ with_int_inner=-150',
-            '│ with_float=float(2.0)',
+            '│ with_float=2.0',
             '│ with_float_inner=2.0',
             '│ with_bool=False',
             '│ with_bool_inner=False',

tests/test_json_args.py

@@ -1463,7 +1463,7 @@ class Order(IntEnum):
                 'with_color_inner': '"RED"',
                 'with_order': '1',
                 'with_order_inner': '1',
-                'logfire.json_schema': '{"type":"object","properties":{"with_model":{"type":"object","title":"Model","x-python-datatype":"PydanticModel"},"with_str":{"type":"string","x-python-datatype":"string","title":"str"},"with_str_inner":{},"with_int":{"type":"integer","x-python-datatype":"number","title":"int"},"with_int_inner":{},"with_float":{"type":"number","x-python-datatype":"number","title":"float"},"with_float_inner":{},"with_bool":{"type":"boolean","x-python-datatype":null,"title":"bool"},"with_bool_inner":{},"with_none":{"type":"null"},"with_none_inner":{"type":"null"},"with_color":{"type":"string","x-python-datatype":"string","title":"Color"},"with_color_inner":{"type":"string","title":"Color","x-python-datatype":"Enum","enum":["RED"]},"with_order":{"type":"integer","x-python-datatype":"number","title":"Order"},"with_order_inner":{"type":"integer","title":"Order","x-python-datatype":"Enum","enum":[1]}}}',
+                'logfire.json_schema': '{"type":"object","properties":{"with_model":{"type":"object","title":"Model","x-python-datatype":"PydanticModel"},"with_str":{"type":"string","x-python-datatype":"string"},"with_str_inner":{},"with_int":{"type":"integer","x-python-datatype":"number"},"with_int_inner":{},"with_float":{"type":"number","x-python-datatype":"number"},"with_float_inner":{},"with_bool":{"type":"boolean","x-python-datatype":null},"with_bool_inner":{},"with_none":{"type":"null"},"with_none_inner":{"type":"null"},"with_color":{"type":"string","x-python-datatype":"string","title":"Color"},"with_color_inner":{"type":"string","title":"Color","x-python-datatype":"Enum","enum":["RED"]},"with_order":{"type":"integer","x-python-datatype":"number","title":"Order"},"with_order_inner":{"type":"integer","title":"Order","x-python-datatype":"Enum","enum":[1]}}}',
             },
         }
     ]