Create ai client and db before passing to handlers

initialcapacity · May 2, 2024 · cd81d79 · cd81d79
1 parent b0c83ba
commit cd81d79
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/cmd/app/main.go b/cmd/app/main.go
@@ -2,6 +2,8 @@ package main
 
 import (
 	"github.com/initialcapacity/ai-starter/internal/app"
+	"github.com/initialcapacity/ai-starter/pkg/ai"
+	"github.com/initialcapacity/ai-starter/pkg/dbsupport"
 	"github.com/initialcapacity/ai-starter/pkg/websupport"
 	"log"
 )
@@ -13,7 +15,10 @@ func main() {
 	openAiKey := websupport.RequireEnvironmentVariable[string]("OPEN_AI_KEY")
 	databaseUrl := websupport.RequireEnvironmentVariable[string]("DATABASE_URL")
 
-	server := websupport.NewServer(app.Handlers(openAiKey, openAiEndpoint, databaseUrl))
+	aiClient := ai.NewClient(openAiKey, openAiEndpoint)
+	db := dbsupport.CreateConnection(databaseUrl)
+
+	server := websupport.NewServer(app.Handlers(aiClient, db))
 
 	_, done := server.Start(host, port)
 	log.Fatal(<-done)

diff --git a/internal/app/handlers.go b/internal/app/handlers.go
@@ -1,16 +1,14 @@
 package app
 
 import (
+	"database/sql"
 	"github.com/initialcapacity/ai-starter/internal/analyzer"
 	"github.com/initialcapacity/ai-starter/pkg/ai"
-	"github.com/initialcapacity/ai-starter/pkg/dbsupport"
 	"io/fs"
 	"net/http"
 )
 
-func Handlers(openAiKey, openAiEndpoint, databaseUrl string) func(mux *http.ServeMux) {
-	aiClient := ai.NewClient(openAiKey, openAiEndpoint)
-	db := dbsupport.CreateConnection(databaseUrl)
+func Handlers(aiClient ai.Client, db *sql.DB) func(mux *http.ServeMux) {
 	embeddingsGateway := analyzer.NewEmbeddingsGateway(db)
 
 	return func(mux *http.ServeMux) {

diff --git a/internal/app/health_test.go b/internal/app/health_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestHealth(t *testing.T) {
-	server := websupport.NewServer(app.Handlers("", "", ""))
+	server := websupport.NewServer(app.Handlers(testsupport.NewTestAiClient(""), nil))
 	port, _ := server.Start("localhost", 0)
 	testsupport.AssertHealthy(t, port, "/health")
 }