diff --git a/cmd/answer.go b/cmd/answer.go index cdd484f..c64ff58 100644 --- a/cmd/answer.go +++ b/cmd/answer.go @@ -1,9 +1,6 @@ package main import ( - "answer/pkg/answer" - "answer/pkg/cache" - "answer/pkg/search" "context" "log/slog" "os" @@ -13,6 +10,9 @@ import ( "github.com/joho/godotenv" "github.com/urfave/cli" + "gitea.stevedudenhoeffer.com/steve/answer/pkg/answer" + "gitea.stevedudenhoeffer.com/steve/answer/pkg/cache" + "gitea.stevedudenhoeffer.com/steve/answer/pkg/search" gollm "gitea.stevedudenhoeffer.com/steve/go-llm" ) diff --git a/go.mod b/go.mod index 6631a28..0d6c969 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.23.2 replace github.com/rocketlaunchr/google-search => github.com/chrisjoyce911/google-search v0.0.0-20230910003754-e501aedf805a require ( + gitea.stevedudenhoeffer.com/steve/go-extractor v0.0.0-20250123020607-964a98a5a884 gitea.stevedudenhoeffer.com/steve/go-llm v0.0.0-20250123045620-0d909edd44d9 github.com/advancedlogic/GoOse v0.0.0-20231203033844-ae6b36caf275 github.com/joho/godotenv v1.5.1 @@ -20,7 +21,6 @@ require ( cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect cloud.google.com/go/compute/metadata v0.6.0 // indirect cloud.google.com/go/longrunning v0.6.4 // indirect - gitea.stevedudenhoeffer.com/steve/go-extractor v0.0.0-20250123020607-964a98a5a884 // indirect github.com/PuerkitoBio/goquery v1.10.2 // indirect github.com/andybalholm/cascadia v1.3.3 // indirect github.com/antchfx/htmlquery v1.3.4 // indirect diff --git a/pkg/answer/answer.go b/pkg/answer/answer.go index 899e801..7c25eb3 100644 --- a/pkg/answer/answer.go +++ b/pkg/answer/answer.go @@ -1,16 +1,17 @@ package answer import ( - "answer/pkg/cache" - "answer/pkg/extractor" - "answer/pkg/search" "context" "errors" "fmt" - gollm "gitea.stevedudenhoeffer.com/steve/go-llm" "log/slog" "net/url" "strings" + + "gitea.stevedudenhoeffer.com/steve/answer/pkg/cache" + "gitea.stevedudenhoeffer.com/steve/answer/pkg/extractor" + "gitea.stevedudenhoeffer.com/steve/answer/pkg/search" + gollm "gitea.stevedudenhoeffer.com/steve/go-llm" ) var ErrMaxTries = errors.New("maximum number of pages tried reached") diff --git a/pkg/extractor/extractor.go b/pkg/extractor/extractor.go index 34223c2..2f1ce7e 100644 --- a/pkg/extractor/extractor.go +++ b/pkg/extractor/extractor.go @@ -1,9 +1,10 @@ package extractor import ( - "answer/pkg/cache" "context" "errors" + + "gitea.stevedudenhoeffer.com/steve/answer/pkg/cache" ) var ErrFailedToExtract = errors.New("failed to extract") diff --git a/pkg/search/duckduckgo.go b/pkg/search/duckduckgo.go index 7a331ce..8959712 100644 --- a/pkg/search/duckduckgo.go +++ b/pkg/search/duckduckgo.go @@ -1,13 +1,12 @@ package search import ( - "answer/pkg/cache" "context" "fmt" "time" + "gitea.stevedudenhoeffer.com/steve/answer/pkg/cache" "gitea.stevedudenhoeffer.com/steve/go-extractor" - "gitea.stevedudenhoeffer.com/steve/go-extractor/sites/duckduckgo" ) diff --git a/pkg/search/google.go b/pkg/search/google.go index 8a97c34..2b83d8b 100644 --- a/pkg/search/google.go +++ b/pkg/search/google.go @@ -1,11 +1,13 @@ package search import ( - "answer/pkg/cache" "context" - googlesearch "github.com/rocketlaunchr/google-search" "log/slog" "sort" + + googlesearch "github.com/rocketlaunchr/google-search" + + "gitea.stevedudenhoeffer.com/steve/answer/pkg/cache" ) type Google struct {