Merge branch 'kercre123:main' into llm-empty-response-fix

Author: hiamitabha

chipper/webroot/js/initial.js

@@ -63,7 +63,8 @@ function sendSetupInfo() {
             });
         }, 500);
       } else if (response.includes("vosk")) {
-        initWeatherAPIKey();
+        console.log(response)
+        setConn();
       } else if (response.includes("error")) {
         updateSetupStatus(response);
         document.getElementById("config-options").style.display = "block";

chipper/webroot/sdkapp/settings.html

@@ -342,6 +342,7 @@ <h2 style="margin-bottom:0px;">Set Time Zone</h2>
             <option value="America/Argentina/Buenos_Aires">America/Argentina/Buenos_Aires</option>
             <option value="America/Santiago">America/Santiago</option>
             <option value="America/Sao_Paulo">America/Sao_Paulo</option>
+            <option value="America/Halifax">America/Halifax</option>
             <option value="America/St_Johns">America/St_Johns</option>
             <option value="GMT">GMT</option>
             <option value="Europe/Lisbon">Europe/Lisbon</option>

vector-cloud/build/vic-cloud

@@ -18,7 +18,6 @@ import (
 	"github.com/digital-dream-labs/vector-cloud/internal/ipc"
 	"github.com/digital-dream-labs/vector-cloud/internal/jdocs"
 	"github.com/digital-dream-labs/vector-cloud/internal/log"
-	"github.com/digital-dream-labs/vector-cloud/internal/logcollector"
 	"github.com/digital-dream-labs/vector-cloud/internal/robot"
 	"github.com/digital-dream-labs/vector-cloud/internal/token"
 	"github.com/digital-dream-labs/vector-cloud/internal/voice"
@@ -145,7 +144,7 @@ func main() {
 	ms := flag.Bool("ms", false, "force microsoft handling on the server end")
 	lex := flag.Bool("lex", false, "force amazon handling on the server end")
 
-	awsRegion := flag.String("region", "us-west-2", "AWS Region")
+	//awsRegion := flag.String("region", "us-west-2", "AWS Region")
 
 	flag.Parse()
 
@@ -207,11 +206,12 @@ func main() {
 	options = append(options, cloudproc.WithTokenOptions(tokenOpts...))
 	options = append(options, cloudproc.WithJdocs(jdocs.WithServer()))
 
-	logcollectorOpts := []logcollector.Option{logcollector.WithServer()}
-	logcollectorOpts = append(logcollectorOpts, logcollector.WithHTTPClient(getHTTPClient()))
-	logcollectorOpts = append(logcollectorOpts, logcollector.WithS3UrlPrefix(config.Env.LogFiles))
-	logcollectorOpts = append(logcollectorOpts, logcollector.WithAwsRegion(*awsRegion))
-	options = append(options, cloudproc.WithLogCollectorOptions(logcollectorOpts...))
+	// disable the STUPID log collector. holy shit
+	// logcollectorOpts := []logcollector.Option{logcollector.WithServer()}
+	// logcollectorOpts = append(logcollectorOpts, logcollector.WithHTTPClient(getHTTPClient()))
+	// logcollectorOpts = append(logcollectorOpts, logcollector.WithS3UrlPrefix(config.Env.LogFiles))
+	// logcollectorOpts = append(logcollectorOpts, logcollector.WithAwsRegion(*awsRegion))
+	//options = append(options, cloudproc.WithLogCollectorOptions(logcollectorOpts...))
 
 	cloudproc.Run(context.Background(), options...)