Merge pull request #837 from 0xff-dev/main

chore: remove WEATHER_API_KEY,BING_KEY environment variable
kubeagi · Mar 13, 2024 · 433ac09 · 433ac09
2 parents 647ba0b + 4835882
commit 433ac09
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 13 deletions.
diff --git a/deploy/charts/arcadia/Chart.yaml b/deploy/charts/arcadia/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: arcadia
 description: A Helm chart(Also a KubeBB Component) for KubeAGI Arcadia
 type: application
-version: 0.3.10
+version: 0.3.11
 appVersion: "0.2.0"
 
 keywords:

diff --git a/deploy/charts/arcadia/templates/apiserver.yaml b/deploy/charts/arcadia/templates/apiserver.yaml
@@ -32,10 +32,6 @@ spec:
                   fieldPath: metadata.namespace
             - name: DEFAULT_CONFIG
               value: {{ .Release.Name }}-config
-            - name: BING_KEY
-              value: {{ .Values.apiserver.bingKey }}
-            - name: WEATHER_API_KEY
-              value: {{ .Values.apiserver.weatherKey }}
           command:
             - "./apiserver"
           args:

diff --git a/deploy/charts/arcadia/values.yaml b/deploy/charts/arcadia/values.yaml
@@ -25,8 +25,6 @@ controller:
 # @section graphql and bff server
 # related project: https://github.com/kubeagi/arcadia/tree/main/apiserver
 apiserver:
-  bingKey: c30e4d7f3ec24c31a489f883616844b5
-  weatherKey: SDkZmNdUks4-fH1Ii
   loglevel: 3
   image: kubeagi/arcadia:latest
   enableplayground: false

diff --git a/pkg/tools/bingsearch/client.go b/pkg/tools/bingsearch/client.go
@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"os"
 	"strconv"
 	"sync"
 
@@ -51,7 +50,6 @@ type options struct {
 
 func defaultOptions() options {
 	return options{
-		apiKey:         os.Getenv("BING_KEY"),
 		count:          5,
 		responseFilter: "News,Webpages",
 		promote:        "News,Webpages",

diff --git a/pkg/tools/weather/weatherapi.go b/pkg/tools/weather/weatherapi.go
@@ -17,7 +17,6 @@ package weather
 
 import (
 	"context"
-	"os"
 	"strings"
 
 	"github.com/tmc/langchaingo/callbacks"
@@ -42,9 +41,6 @@ var _ tools.Tool = Tool{}
 // New creates a new weather tool to search on internet
 func New(tool *v1alpha1.Tool) (*Tool, error) {
 	apikey := tool.Params["apiKey"]
-	if apikey == "" {
-		apikey = os.Getenv("WEATHER_API_KEY")
-	}
 	return &Tool{
 		client: internal.New(apikey),
 	}, nil