feat: enable Rest api using grpc-gateway (#834)

* grpc-gateway changes Signed-off-by: Sahil Badla <[email protected]> * feat: grpc-gateway impl Signed-off-by: Sahil Badla <[email protected]> * feat: enable REST/http api support Signed-off-by: Sahil Badla <[email protected]> * feat: enable rest/http support Signed-off-by: Sahil Badla <[email protected]> * feat: enable rest/http support Signed-off-by: Sahil Badla <[email protected]> * feat: enable rest/http support Signed-off-by: Sahil Badla <[email protected]> * chore: resolved mod Signed-off-by: Alex Jones <[email protected]> * feat: fix grpc-gateway codegen path Signed-off-by: Sahil Badla <[email protected]> * feat: merge from master Signed-off-by: Sahil Badla <[email protected]> * feat: flag to enable rest api Signed-off-by: Sahil Badla <[email protected]> --------- Signed-off-by: Sahil Badla <[email protected]> Signed-off-by: Sahil Badla <[email protected]> Signed-off-by: Alex Jones <[email protected]> Co-authored-by: Sahil Badla <[email protected]> Co-authored-by: Thomas Schuetz <[email protected]> Co-authored-by: Alex Jones <[email protected]>
k8sgpt-ai · Feb 17, 2024 · f2138c7 · f2138c7
1 parent 3f0356b
commit f2138c7
Show file tree

Hide file tree

Showing 4 changed files with 849 additions and 10 deletions.
diff --git a/cmd/serve/serve.go b/cmd/serve/serve.go
@@ -33,6 +33,7 @@ var (
 	port        string
 	metricsPort string
 	backend     string
+	enableHttp  bool
 )
 
 var ServeCmd = &cobra.Command{
@@ -131,6 +132,7 @@ var ServeCmd = &cobra.Command{
 			Backend:     aiProvider.Name,
 			Port:        port,
 			MetricsPort: metricsPort,
+			EnableHttp:  enableHttp,
 			Token:       aiProvider.Password,
 			Logger:      logger,
 		}
@@ -158,4 +160,5 @@ func init() {
 	ServeCmd.Flags().StringVarP(&port, "port", "p", "8080", "Port to run the server on")
 	ServeCmd.Flags().StringVarP(&metricsPort, "metrics-port", "", "8081", "Port to run the metrics-server on")
 	ServeCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
+	ServeCmd.Flags().BoolVarP(&enableHttp, "http", "h", false, "Enable REST/http using gppc-gateway")
 }
diff --git a/go.mod b/go.mod
@@ -24,6 +24,7 @@ require (
 require github.com/adrg/xdg v0.4.0
 
 require (
+	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc-ecosystem/gateway/v2 v2.19.1-20240213144542-6e830f3fdf19.1
 	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.3.0-20240213144542-6e830f3fdf19.2
 	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.32.0-20240213144542-6e830f3fdf19.1
 	cloud.google.com/go/storage v1.37.0
@@ -32,6 +33,7 @@ require (
 	github.com/aws/aws-sdk-go v1.50.20
 	github.com/cohere-ai/cohere-go v0.2.0
 	github.com/google/generative-ai-go v0.7.0
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
 	github.com/hupe1980/go-huggingface v0.0.15
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/prometheus/prometheus v0.49.1
@@ -48,7 +50,7 @@ require (
 	atomicgo.dev/schedule v0.1.0 // indirect
 	cloud.google.com/go v0.112.0 // indirect
 	cloud.google.com/go/ai v0.3.0 // indirect
-	cloud.google.com/go/compute v1.23.3 // indirect
+	cloud.google.com/go/compute v1.24.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.5 // indirect
 	cloud.google.com/go/longrunning v0.5.4 // indirect
@@ -92,7 +94,7 @@ require (
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
 	go.opentelemetry.io/otel/metric v1.23.0 // indirect
 	google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect
 	gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -216,7 +218,7 @@ require (
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.19.0 // indirect
 	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
-	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/net v0.21.0
 	golang.org/x/oauth2 v0.17.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect