chore: migrate examples

Author: jacobzim-stl

examples/chat-completion-accumulating/main.go

@@ -70,44 +70,40 @@ func main() {
 	}
 }
 
-var tools = []openai.ChatCompletionToolParam{
-	{
-		Function: openai.FunctionDefinitionParam{
-			Name:        "get_live_weather",
-			Description: openai.String("Get weather at the given location"),
-			Parameters: openai.FunctionParameters{
-				"type": "object",
-				"properties": map[string]interface{}{
-					"location": map[string]string{
-						"type": "string",
-					},
+var tools = []openai.ChatCompletionToolUnionParam{
+	openai.ChatCompletionFunctionTool(openai.FunctionDefinitionParam{
+		Name:        "get_live_weather",
+		Description: openai.String("Get weather at the given location"),
+		Parameters: openai.FunctionParameters{
+			"type": "object",
+			"properties": map[string]any{
+				"location": map[string]string{
+					"type": "string",
 				},
-				"required": []string{"location"},
 			},
+			"required": []string{"location"},
 		},
-	},
-	{
-		Function: openai.FunctionDefinitionParam{
-			Name:        "get_population",
-			Description: openai.String("Get population of a given town"),
-			Parameters: openai.FunctionParameters{
-				"type": "object",
-				"properties": map[string]interface{}{
-					"town": map[string]string{
-						"type": "string",
-					},
-					"nation": map[string]string{
-						"type": "string",
-					},
-					"rounding": map[string]string{
-						"type":        "integer",
-						"description": "Nearest base 10 to round to, e.g. 1000 or 1000000",
-					},
+	}),
+	openai.ChatCompletionFunctionTool(openai.FunctionDefinitionParam{
+		Name:        "get_population",
+		Description: openai.String("Get population of a given town"),
+		Parameters: openai.FunctionParameters{
+			"type": "object",
+			"properties": map[string]any{
+				"town": map[string]string{
+					"type": "string",
+				},
+				"nation": map[string]string{
+					"type": "string",
+				},
+				"rounding": map[string]string{
+					"type":        "integer",
+					"description": "Nearest base 10 to round to, e.g. 1000 or 1000000",
 				},
-				"required": []string{"town", "nation"},
 			},
+			"required": []string{"town", "nation"},
 		},
-	},
+	}),
 }
 
 // Mock function to simulate weather data retrieval

examples/chat-completion-tool-calling/main.go

@@ -22,22 +22,20 @@ func main() {
 		Messages: []openai.ChatCompletionMessageParamUnion{
 			openai.UserMessage(question),
 		},
-		Tools: []openai.ChatCompletionToolParam{
-			{
-				Function: openai.FunctionDefinitionParam{
-					Name:        "get_weather",
-					Description: openai.String("Get weather at the given location"),
-					Parameters: openai.FunctionParameters{
-						"type": "object",
-						"properties": map[string]interface{}{
-							"location": map[string]string{
-								"type": "string",
-							},
+		Tools: []openai.ChatCompletionToolUnionParam{
+			openai.ChatCompletionFunctionTool(openai.FunctionDefinitionParam{
+				Name:        "get_weather",
+				Description: openai.String("Get weather at the given location"),
+				Parameters: openai.FunctionParameters{
+					"type": "object",
+					"properties": map[string]any{
+						"location": map[string]string{
+							"type": "string",
 						},
-						"required": []string{"location"},
 					},
+					"required": []string{"location"},
 				},
-			},
+			}),
 		},
 		Seed:  openai.Int(0),
 		Model: openai.ChatModelGPT4o,

examples/vectorstorefilebatch/main.go

@@ -19,10 +19,10 @@ func main() {
 	for _, arg := range os.Args[2:] {
 		println("File to upload:", arg)
 		rdr, err := os.Open(arg)
-		defer rdr.Close()
 		if err != nil {
 			panic("file open failed:" + err.Error())
 		}
+		defer rdr.Close()
 
 		fileParams = append(fileParams, openai.FileNewParams{
 			File:    rdr,
@@ -60,14 +60,13 @@ func main() {
 	println("Listing the files from the vector store")
 
 	vector := openai.VectorStoreFileBatchListFilesParams{
-		Order:         openai.VectorStoreFileBatchListFilesParamsOrderAsc,
-		VectorStoreID: vectorStore.ID,
+		Order: openai.VectorStoreFileBatchListFilesParamsOrderAsc,
 	}
 
 	q, _ := vector.URLQuery()
 	println("Vector JSON:", q)
 
-	filesCursor, err := client.VectorStores.FileBatches.ListFiles(ctx, batch.ID, vector)
+	filesCursor, err := client.VectorStores.FileBatches.ListFiles(ctx, vectorStore.ID, batch.ID, vector)
 
 	if err != nil {
 		panic(err)