Merge remote-tracking branch 'origin/main--merge-conflict' into next

Author: jacobzim-stl

internal/encoding/json/encode.go

@@ -19,8 +19,6 @@ import (
 	"encoding"
 	"encoding/base64"
 	"fmt"
-	"github.com/openai/openai-go/internal/encoding/json/sentinel"
-	"github.com/openai/openai-go/internal/encoding/json/shims"
 	"math"
 	"reflect"
 	"slices"
@@ -30,6 +28,9 @@ import (
 	"unicode"
 	"unicode/utf8"
 	_ "unsafe" // for linkname
+
+	"github.com/openai/openai-go/internal/encoding/json/sentinel"
+	"github.com/openai/openai-go/internal/encoding/json/shims"
 )
 
 // Marshal returns the JSON encoding of v.

internal/encoding/json/shims/shims.go

@@ -11,7 +11,7 @@ import (
 	"slices"
 )
 
-const EscapeHTMLByDefault = true
+const EscapeHTMLByDefault = false
 
 type OverflowableType struct{ reflect.Type }
 

packages/param/option.go

@@ -3,8 +3,9 @@ package param
 import (
 	"encoding/json"
 	"fmt"
-	shimjson "github.com/openai/openai-go/internal/encoding/json"
 	"time"
+
+	shimjson "github.com/openai/openai-go/internal/encoding/json"
 )
 
 func NewOpt[T comparable](v T) Opt[T] {