Skip to content

Commit 95dda45

Browse files
kinarrkinarr
committed
Tidy up code
1 parent 6e8e809 commit 95dda45

File tree

1 file changed

+64
-64
lines changed

1 file changed

+64
-64
lines changed

‎go/text_generation.go‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ func TextGenMultimodalOneImagePrompt() (*genai.GenerateContentResponse, error) {
7272
log.Fatal(err)
7373
}
7474
imagePath := filepath.Join(getMedia(), "organ.jpg")
75-
f, err := os.Open(imagePath)
75+
file, err := os.Open(imagePath)
7676
if err != nil {
77-
log.Fatal(err)
77+
log.Fatal("Error opening file:", err)
7878
}
79-
data, err := io.ReadAll(f)
80-
f.Close()
79+
defer file.Close()
80+
data, err := io.ReadAll(file)
8181
if err != nil {
82-
log.Fatal(err)
82+
log.Fatal("Error reading file:", err)
8383
}
8484
imagePart := &genai.Part{
8585
InlineData: &genai.Blob{
@@ -111,14 +111,14 @@ func TextGenMultimodalOneImagePromptStreaming() error {
111111
log.Fatal(err)
112112
}
113113
imagePath := filepath.Join(getMedia(), "organ.jpg")
114-
f, err := os.Open(imagePath)
114+
file, err := os.Open(imagePath)
115115
if err != nil {
116-
log.Fatal(err)
116+
log.Fatal("Error opening file:", err)
117117
}
118-
data, err := io.ReadAll(f)
119-
f.Close()
118+
defer file.Close()
119+
data, err := io.ReadAll(file)
120120
if err != nil {
121-
log.Fatal(err)
121+
log.Fatal("Error reading file:", err)
122122
}
123123
imagePart := &genai.Part{
124124
InlineData: &genai.Blob{
@@ -157,27 +157,27 @@ func TextGenMultimodalMultiImagePrompt() (*genai.GenerateContentResponse, error)
157157
}
158158
organPath := filepath.Join(getMedia(), "organ.jpg")
159159
cajunPath := filepath.Join(getMedia(), "Cajun_instruments.jpg")
160-
fOrg, err := os.Open(organPath)
160+
organFile, err := os.Open(organPath)
161161
if err != nil {
162-
log.Fatal(err)
162+
log.Fatal("Error opening file:", err)
163163
}
164-
dataOrg, err := io.ReadAll(fOrg)
165-
fOrg.Close()
164+
defer organFile.Close()
165+
organData, err := io.ReadAll(organFile)
166166
if err != nil {
167-
log.Fatal(err)
167+
log.Fatal("Error reading file:", err)
168168
}
169-
fCajun, err := os.Open(cajunPath)
169+
cajunFile, err := os.Open(cajunPath)
170170
if err != nil {
171-
log.Fatal(err)
171+
log.Fatal("Error opening file:", err)
172172
}
173-
dataCajun, err := io.ReadAll(fCajun)
174-
fCajun.Close()
173+
defer cajunFile.Close()
174+
cajunData, err := io.ReadAll(cajunFile)
175175
if err != nil {
176-
log.Fatal(err)
176+
log.Fatal("Error reading file:", err)
177177
}
178178
parts := []*genai.Part{
179-
{InlineData: &genai.Blob{Data: dataOrg, MIMEType: "image/jpeg"}},
180-
{InlineData: &genai.Blob{Data: dataCajun, MIMEType: "image/jpeg"}},
179+
{InlineData: &genai.Blob{Data: organData, MIMEType: "image/jpeg"}},
180+
{InlineData: &genai.Blob{Data: cajunData, MIMEType: "image/jpeg"}},
181181
}
182182
contents := []*genai.Content{
183183
genai.NewUserContentFromText(
@@ -206,27 +206,27 @@ func TextGenMultimodalMultiImagePromptStreaming() error {
206206
}
207207
organPath := filepath.Join(getMedia(), "organ.jpg")
208208
cajunPath := filepath.Join(getMedia(), "Cajun_instruments.jpg")
209-
fOrg, err := os.Open(organPath)
209+
organFile, err := os.Open(organPath)
210210
if err != nil {
211-
log.Fatal(err)
211+
log.Fatal("Error opening file:", err)
212212
}
213-
dataOrg, err := io.ReadAll(fOrg)
214-
fOrg.Close()
213+
defer organFile.Close()
214+
organData, err := io.ReadAll(organFile)
215215
if err != nil {
216-
log.Fatal(err)
216+
log.Fatal("Error reading file:", err)
217217
}
218-
fCajun, err := os.Open(cajunPath)
218+
cajunFile, err := os.Open(cajunPath)
219219
if err != nil {
220-
log.Fatal(err)
220+
log.Fatal("Error opening file:", err)
221221
}
222-
dataCajun, err := io.ReadAll(fCajun)
223-
fCajun.Close()
222+
defer cajunFile.Close()
223+
cajunData, err := io.ReadAll(cajunFile)
224224
if err != nil {
225-
log.Fatal(err)
225+
log.Fatal("Error reading file:", err)
226226
}
227227
parts := []*genai.Part{
228-
{InlineData: &genai.Blob{Data: dataOrg, MIMEType: "image/jpeg"}},
229-
{InlineData: &genai.Blob{Data: dataCajun, MIMEType: "image/jpeg"}},
228+
{InlineData: &genai.Blob{Data: organData, MIMEType: "image/jpeg"}},
229+
{InlineData: &genai.Blob{Data: cajunData, MIMEType: "image/jpeg"}},
230230
}
231231
contents := []*genai.Content{
232232
genai.NewUserContentFromText(
@@ -261,14 +261,14 @@ func TextGenMultimodalAudio() (*genai.GenerateContentResponse, error) {
261261
}
262262
prompt := "Give me a summary of this audio file."
263263
audioPath := filepath.Join(getMedia(), "sample.mp3")
264-
f, err := os.Open(audioPath)
264+
file, err := os.Open(audioPath)
265265
if err != nil {
266-
log.Fatal(err)
266+
log.Fatal("Error opening file:", err)
267267
}
268-
data, err := io.ReadAll(f)
269-
f.Close()
268+
defer file.Close()
269+
data, err := io.ReadAll(file)
270270
if err != nil {
271-
log.Fatal(err)
271+
log.Fatal("Error reading file:", err)
272272
}
273273
audioPart := &genai.Part{
274274
InlineData: &genai.Blob{Data: data, MIMEType: "audio/mpeg"},
@@ -298,14 +298,14 @@ func TextGenMultimodalAudioStreaming() error {
298298
}
299299
prompt := "Give me a summary of this audio file."
300300
audioPath := filepath.Join(getMedia(), "sample.mp3")
301-
f, err := os.Open(audioPath)
301+
file, err := os.Open(audioPath)
302302
if err != nil {
303-
log.Fatal(err)
303+
log.Fatal("Error opening file:", err)
304304
}
305-
data, err := io.ReadAll(f)
306-
f.Close()
305+
defer file.Close()
306+
data, err := io.ReadAll(file)
307307
if err != nil {
308-
log.Fatal(err)
308+
log.Fatal("Error reading file:", err)
309309
}
310310
audioPart := &genai.Part{
311311
InlineData: &genai.Blob{Data: data, MIMEType: "audio/mpeg"},
@@ -340,14 +340,14 @@ func TextGenMultimodalVideoPrompt() (*genai.GenerateContentResponse, error) {
340340
log.Fatal(err)
341341
}
342342
videoPath := filepath.Join(getMedia(), "Big_Buck_Bunny.mp4")
343-
f, err := os.Open(videoPath)
343+
file, err := os.Open(videoPath)
344344
if err != nil {
345-
log.Fatal(fmt.Errorf("error opening file: %v", err))
345+
log.Fatal("Error opening file:", err)
346346
}
347-
defer f.Close()
348-
data, err := io.ReadAll(f)
347+
defer file.Close()
348+
data, err := io.ReadAll(file)
349349
if err != nil {
350-
log.Fatal(fmt.Errorf("error reading file: %v", err))
350+
log.Fatal("Error reading file:", err)
351351
}
352352
parts := []*genai.Part{
353353
{Text: "Describe this video clip"},
@@ -376,14 +376,14 @@ func TextGenMultimodalVideoPromptStreaming() error {
376376
log.Fatal(err)
377377
}
378378
videoPath := filepath.Join(getMedia(), "Big_Buck_Bunny.mp4")
379-
f, err := os.Open(videoPath)
379+
file, err := os.Open(videoPath)
380380
if err != nil {
381-
log.Fatal(fmt.Errorf("error opening file: %v", err))
381+
log.Fatal("Error opening file:", err)
382382
}
383-
defer f.Close()
384-
data, err := io.ReadAll(f)
383+
defer file.Close()
384+
data, err := io.ReadAll(file)
385385
if err != nil {
386-
log.Fatal(fmt.Errorf("error reading file: %v", err))
386+
log.Fatal("Error reading file:", err)
387387
}
388388
parts := []*genai.Part{
389389
{Text: "Describe this video clip"},
@@ -418,14 +418,14 @@ func TextGenMultimodalPdf() (*genai.GenerateContentResponse, error) {
418418
log.Fatal(err)
419419
}
420420
pdfPath := filepath.Join(getMedia(), "test.pdf")
421-
f, err := os.Open(pdfPath)
421+
file, err := os.Open(pdfPath)
422422
if err != nil {
423-
log.Fatal(err)
423+
log.Fatal("Error opening file:", err)
424424
}
425-
data, err := io.ReadAll(f)
426-
f.Close()
425+
defer file.Close()
426+
data, err := io.ReadAll(file)
427427
if err != nil {
428-
log.Fatal(err)
428+
log.Fatal("Error reading file:", err)
429429
}
430430
pdfPart := &genai.Part{
431431
InlineData: &genai.Blob{Data: data, MIMEType: "application/pdf"},
@@ -454,14 +454,14 @@ func TextGenMultimodalPdfStreaming() error {
454454
log.Fatal(err)
455455
}
456456
pdfPath := filepath.Join(getMedia(), "test.pdf")
457-
f, err := os.Open(pdfPath)
457+
file, err := os.Open(pdfPath)
458458
if err != nil {
459-
log.Fatal(err)
459+
log.Fatal("Error opening file:", err)
460460
}
461-
data, err := io.ReadAll(f)
462-
f.Close()
461+
defer file.Close()
462+
data, err := io.ReadAll(file)
463463
if err != nil {
464-
log.Fatal(err)
464+
log.Fatal("Error reading file:", err)
465465
}
466466
pdfPart := &genai.Part{
467467
InlineData: &genai.Blob{Data: data, MIMEType: "application/pdf"},

0 commit comments

Comments
 (0)