refactor: improved response handling for api client.

kingmariano · Jul 20, 2024 · 1165295 · 1165295
1 parent dc22d92
commit 1165295
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 35 deletions.
diff --git a/packages/convert2mp3/convert2mp3.go b/packages/convert2mp3/convert2mp3.go
@@ -27,10 +27,6 @@ import (
 	"github.com/kingmariano/omnicron/utils"
 )
 
-type Response struct {
-	Response string `json:"response"`
-}
-
 func ConvertToMp3(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig) {
 	ctx := r.Context()
 	// creates a unique folder within the current directory
@@ -62,5 +58,5 @@ func ConvertToMp3(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig)
 		return
 	}
 	//returns back the response in JSON format
-	utils.RespondWithJSON(w, http.StatusOK, Response{Response: urlLink})
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: urlLink})
 }
diff --git a/packages/docgpt/docgpt.go b/packages/docgpt/docgpt.go
@@ -51,5 +51,5 @@ func DocGPT(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig) {
 		return
 	}
 	//responds with JSON
-	utils.RespondWithJSON(w, http.StatusOK, response)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: response})
 }
diff --git a/packages/gpt/gpt.go b/packages/gpt/gpt.go
@@ -61,6 +61,6 @@ func ChatCompletion(w http.ResponseWriter, r *http.Request, cfg *config.APIConfi
 		utils.RespondWithError(w, http.StatusInternalServerError, fmt.Sprintf("Error handling chat completion, %v", err))
 		return
 	}
-	utils.RespondWithJSON(w, http.StatusOK, response)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: response})
 
 }
diff --git a/packages/grok/chatcompletion.go b/packages/grok/chatcompletion.go
@@ -67,5 +67,5 @@ func ChatCompletion(w http.ResponseWriter, r *http.Request, cfg *config.APIConfi
 
 	// new release for grok response
 	// Respond with JSON containing the response message
-	utils.RespondWithJSON(w, http.StatusOK, response)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: response})
 }
diff --git a/packages/grok/transcription.go b/packages/grok/transcription.go
@@ -88,7 +88,5 @@ func Transcription(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig
 		return
 	}
 
-	// Retrieve and respond with the transcription result
-	transcriptionResult := response.Choices[0].Message.Content
-	utils.RespondWithJSON(w, http.StatusOK, transcriptionResult)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: response})
 }
diff --git a/packages/image2text/image2text.go b/packages/image2text/image2text.go
@@ -44,5 +44,5 @@ func Image2text(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig) {
 		utils.RespondWithError(w, http.StatusInternalServerError, fmt.Sprintf("Error calling the Image To Text Endpoint, %v", err))
 		return
 	}
-	utils.RespondWithJSON(w, http.StatusOK, response)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: response})
 }
diff --git a/packages/musicdownloader/music.go b/packages/musicdownloader/music.go
@@ -32,11 +32,6 @@ type SongRequest struct {
 	Song string `json:"song"`
 }
 
-// SongResponse represents the structure of the response
-type SongResponse struct {
-	Response []string `json:"response"`
-}
-
 var maxLength int64 //specifies the maxmium length of data returned from the youtube sdk
 func DownloadMusic(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig) {
 	ctx := r.Context()
@@ -70,5 +65,5 @@ func DownloadMusic(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig
 		utils.RespondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	utils.RespondWithJSON(w, http.StatusOK, SongResponse{Response: audioDirectURL})
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: audioDirectURL})
 }
diff --git a/packages/musicsearch/musicsearch.go b/packages/musicsearch/musicsearch.go
@@ -40,5 +40,5 @@ func MusicSearch(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig)
 		utils.RespondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	utils.RespondWithJSON(w, http.StatusOK, response)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: response})
 }
diff --git a/packages/replicate/generateimages/image_generation.go b/packages/replicate/generateimages/image_generation.go
@@ -58,5 +58,5 @@ func ImageGeneration(w http.ResponseWriter, r *http.Request, cfg *config.APIConf
 		utils.RespondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	utils.RespondWithJSON(w, http.StatusOK, ImagePrediction)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: ImagePrediction})
 }
diff --git a/packages/replicate/generatemusic/generatemusic.go b/packages/replicate/generatemusic/generatemusic.go
@@ -54,6 +54,6 @@ func MusicGen(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig) {
 		return
 	}
 
-	utils.RespondWithJSON(w, http.StatusOK, MusicGenPrediction)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: MusicGenPrediction})
 
 }
diff --git a/packages/replicate/generatevideos/generate_videos.go b/packages/replicate/generatevideos/generate_videos.go
@@ -48,10 +48,10 @@ func VideoGeneration(w http.ResponseWriter, r *http.Request, cfg *config.APIConf
 		utils.RespondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	videoPrediction, err := predictionFunc(ctx, cfg.ReplicateAPIKey, repVideoModel.Version, predictionInput, nil, false)
+	videoGenPrediction, err := predictionFunc(ctx, cfg.ReplicateAPIKey, repVideoModel.Version, predictionInput, nil, false)
 	if err != nil {
 		utils.RespondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	utils.RespondWithJSON(w, http.StatusOK, videoPrediction)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: videoGenPrediction})
 }
diff --git a/packages/replicate/imageupscale/upscale.go b/packages/replicate/imageupscale/upscale.go
@@ -54,5 +54,5 @@ func ImageUpscale(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig)
 		return
 	}
 
-	utils.RespondWithJSON(w, http.StatusOK, ImageUpscalePrediction)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: ImageUpscalePrediction})
 }
diff --git a/packages/replicate/stt/stt.go b/packages/replicate/stt/stt.go
@@ -54,6 +54,6 @@ func STT(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig) {
 		return
 	}
 
-	utils.RespondWithJSON(w, http.StatusOK, STTPrediction)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: STTPrediction})
 
 }
diff --git a/packages/replicate/tts/tts.go b/packages/replicate/tts/tts.go
@@ -54,6 +54,6 @@ func TTS(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig) {
 		return
 	}
 
-	utils.RespondWithJSON(w, http.StatusOK, TTSPrediction)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: TTSPrediction})
 
 }
diff --git a/packages/shazam/shazam.go b/packages/shazam/shazam.go
@@ -44,5 +44,5 @@ func Shazam(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig) {
 		utils.RespondWithError(w, http.StatusInternalServerError, fmt.Sprintf("Error calling Shazam Endpoint, %v", err))
 		return
 	}
-	utils.RespondWithJSON(w, http.StatusOK, response)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: response})
 }
diff --git a/packages/videodownloader/downloader.go b/packages/videodownloader/downloader.go
@@ -31,9 +31,6 @@ type DownloadParams struct {
 	URL        string `json:"url"`
 	Resolution string `json:"resolution"`
 }
-type Responseparams struct {
-	Response string `json:"response"`
-}
 
 // DownloadVideo handles the video download process.
 // It accepts a POST request with JSON body containing URL and resolution.
@@ -87,5 +84,5 @@ func DownloadVideo(w http.ResponseWriter, r *http.Request, cfg *config.APIConfig
 		return
 	}
 
-	utils.RespondWithJSON(w, http.StatusOK, Responseparams{Response: urlLink})
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: urlLink})
 }
diff --git a/packages/videodownloader/handle_download.go b/packages/videodownloader/handle_download.go
@@ -21,7 +21,6 @@ package videodownloader
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"os"
 	"path/filepath"
@@ -112,7 +111,6 @@ func DownloadVideoData(url string, outputName string, outputPath string, resolut
 		MultiThread:  true,
 		ThreadNumber: 50,
 	})
-	log.Printf("the output is %v", outputPath)
 	err = download.Download(data[0])
 	if err != nil {
 		log.Println("cleaning up, deleting folder...")
@@ -121,7 +119,6 @@ func DownloadVideoData(url string, outputName string, outputPath string, resolut
 		}
 		return "", err
 	}
-	fmt.Println("this is final output path", outputPath+outputName+".*")
 	files, err := filepath.Glob(outputPath + "/" + outputName + ".*")
 	if err != nil {
 		return "", err

diff --git a/packages/youtubesummarize/youtubesummarize.go b/packages/youtubesummarize/youtubesummarize.go
@@ -45,5 +45,5 @@ func YoutubeSummarization(w http.ResponseWriter, r *http.Request, cfg *config.AP
 		utils.RespondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
-	utils.RespondWithJSON(w, http.StatusOK, summary)
+	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: summary})
 }
diff --git a/utils/json.go b/utils/json.go
@@ -26,6 +26,10 @@ import (
 	"net/http"
 )
 
+type ResponseMsg struct {
+	Response interface{} `json:"response"`
+}
+
 func RespondWithError(w http.ResponseWriter, code int, errmessage string) {
 	if code < 499 {
 		log.Printf("Responding with 5XX error: %s", errmessage)
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
-    	utils.RespondWithJSON(w, http.StatusOK, MusicGenPrediction)
+    	utils.RespondWithJSON(w, http.StatusOK, utils.ResponseMsg{Response: MusicGenPrediction})
     }