From 040f616543fe161f4cc4a5922c72b588c5c61c87 Mon Sep 17 00:00:00 2001 From: grantdfoster Date: Thu, 23 Oct 2025 08:28:40 +0200 Subject: [PATCH 1/5] fix: handle apify returns --- internal/jobs/twitter.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/jobs/twitter.go b/internal/jobs/twitter.go index 4ac97dfe..8c3e7e79 100644 --- a/internal/jobs/twitter.go +++ b/internal/jobs/twitter.go @@ -739,6 +739,12 @@ func (ts *TwitterScraper) ExecuteJob(j types.Job) (types.JobResult, error) { // Validate the result based on operation type switch { + case args.Type == types.CapGetFollowers || args.Type == types.CapGetFollowing: + var results []*types.ProfileResultApify + if err := jobResult.Unmarshal(&results); err != nil { + logrus.Errorf("Error while unmarshalling followers/following result for job ID %s, type %s: %v", j.UUID, j.Type, err) + return types.JobResult{Error: "error unmarshalling followers/following result for final validation"}, err + } case args.IsSingleTweetOperation(): var result *types.TweetResult if err := jobResult.Unmarshal(&result); err != nil { From 9340da400d28e94ba1ec50f832bcd1f43e3df89f Mon Sep 17 00:00:00 2001 From: grantdfoster Date: Thu, 23 Oct 2025 08:51:25 +0200 Subject: [PATCH 2/5] fix: validation --- api/params/base.go | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/api/params/base.go b/api/params/base.go index 649639ea..18b13927 100644 --- a/api/params/base.go +++ b/api/params/base.go @@ -31,7 +31,21 @@ type Params[T base.JobArgument] struct { } func (p Params[T]) Validate(_ *types.SearchConfig) error { - return p.Args.Validate() + // Convert Args (generic T) to map[string]any + jsonData, err := json.Marshal(p.Args) + if err != nil { + return err + } + var argsMap map[string]any + if err := json.Unmarshal(jsonData, &argsMap); err != nil { + return err + } + + // Force typed unmarshal by job type which triggers defaults + Validate() + if _, err := args.UnmarshalJobArguments(p.JobType, argsMap); err != nil { + return err + } + return nil } func (p Params[T]) Type() types.JobType { @@ -60,8 +74,9 @@ func (l Params[T]) Arguments(cfg *types.SearchConfig) map[string]any { // Use UnmarshalJobArguments to get properly typed arguments with correct type ja, err := args.UnmarshalJobArguments(l.JobType, argsMap) if err != nil { - // Fallback to original args if unmarshaling fails - return argsMap + // Validation should have already occurred in Validate(); avoid silently + // proceeding with potentially invalid arguments here. + return nil } // Convert ja to map[string]any From f31093625677de52183424defacbd734bf398ad0 Mon Sep 17 00:00:00 2001 From: grantdfoster Date: Thu, 23 Oct 2025 09:03:32 +0200 Subject: [PATCH 3/5] chore: fix error messaging tree --- api/args/unmarshaller.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api/args/unmarshaller.go b/api/args/unmarshaller.go index 16d2a89a..41622540 100644 --- a/api/args/unmarshaller.go +++ b/api/args/unmarshaller.go @@ -55,7 +55,7 @@ func UnmarshalJobArguments(jobType types.JobType, args Args) (base.JobArgument, func unmarshalWebArguments(args Args) (*web.ScraperArguments, error) { webArgs := &web.ScraperArguments{} if err := unmarshalToStruct(args, webArgs); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, fmt.Errorf("%w", err) } return webArgs, nil } @@ -63,25 +63,25 @@ func unmarshalWebArguments(args Args) (*web.ScraperArguments, error) { func unmarshalTikTokArguments(args Args) (base.JobArgument, error) { minimal := base.Arguments{} if err := unmarshalToStruct(args, &minimal); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, fmt.Errorf("%w", err) } switch minimal.Type { case types.CapSearchByQuery: searchArgs := &tiktok.QueryArguments{} if err := unmarshalToStruct(args, searchArgs); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, fmt.Errorf("%w", err) } return searchArgs, nil case types.CapSearchByTrending: searchArgs := &tiktok.TrendingArguments{} if err := unmarshalToStruct(args, searchArgs); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, fmt.Errorf("%w", err) } return searchArgs, nil case types.CapTranscription: transcriptionArgs := &tiktok.TranscriptionArguments{} if err := unmarshalToStruct(args, transcriptionArgs); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, fmt.Errorf("%w", err) } return transcriptionArgs, nil default: From a7edf7b9427dc9a91f4ac60ab123b6a1be14cac9 Mon Sep 17 00:00:00 2001 From: grantdfoster Date: Thu, 23 Oct 2025 09:08:25 +0200 Subject: [PATCH 4/5] fix: error tree on unmarshall --- api/args/unmarshaller.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/args/unmarshaller.go b/api/args/unmarshaller.go index 41622540..a8a7aaa9 100644 --- a/api/args/unmarshaller.go +++ b/api/args/unmarshaller.go @@ -55,7 +55,7 @@ func UnmarshalJobArguments(jobType types.JobType, args Args) (base.JobArgument, func unmarshalWebArguments(args Args) (*web.ScraperArguments, error) { webArgs := &web.ScraperArguments{} if err := unmarshalToStruct(args, webArgs); err != nil { - return nil, fmt.Errorf("%w", err) + return nil, err } return webArgs, nil } @@ -63,25 +63,25 @@ func unmarshalWebArguments(args Args) (*web.ScraperArguments, error) { func unmarshalTikTokArguments(args Args) (base.JobArgument, error) { minimal := base.Arguments{} if err := unmarshalToStruct(args, &minimal); err != nil { - return nil, fmt.Errorf("%w", err) + return nil, err } switch minimal.Type { case types.CapSearchByQuery: searchArgs := &tiktok.QueryArguments{} if err := unmarshalToStruct(args, searchArgs); err != nil { - return nil, fmt.Errorf("%w", err) + return nil, err } return searchArgs, nil case types.CapSearchByTrending: searchArgs := &tiktok.TrendingArguments{} if err := unmarshalToStruct(args, searchArgs); err != nil { - return nil, fmt.Errorf("%w", err) + return nil, err } return searchArgs, nil case types.CapTranscription: transcriptionArgs := &tiktok.TranscriptionArguments{} if err := unmarshalToStruct(args, transcriptionArgs); err != nil { - return nil, fmt.Errorf("%w", err) + return nil, err } return transcriptionArgs, nil default: @@ -92,7 +92,7 @@ func unmarshalTikTokArguments(args Args) (base.JobArgument, error) { func unmarshalTwitterArguments(args Args) (*twitter.SearchArguments, error) { twitterArgs := &twitter.SearchArguments{} if err := unmarshalToStruct(args, twitterArgs); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, err } return twitterArgs, nil } @@ -100,7 +100,7 @@ func unmarshalTwitterArguments(args Args) (*twitter.SearchArguments, error) { func unmarshalLinkedInArguments(args Args) (*linkedin.ProfileArguments, error) { linkedInArgs := &linkedin.ProfileArguments{} if err := unmarshalToStruct(args, linkedInArgs); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, err } return linkedInArgs, nil } @@ -108,7 +108,7 @@ func unmarshalLinkedInArguments(args Args) (*linkedin.ProfileArguments, error) { func unmarshalRedditArguments(args Args) (*reddit.SearchArguments, error) { redditArgs := &reddit.SearchArguments{} if err := unmarshalToStruct(args, redditArgs); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, err } return redditArgs, nil } @@ -116,7 +116,7 @@ func unmarshalRedditArguments(args Args) (*reddit.SearchArguments, error) { func unmarshalTelemetryArguments(args Args) (*telemetry.Arguments, error) { telemetryArgs := &telemetry.Arguments{} if err := unmarshalToStruct(args, telemetryArgs); err != nil { - return nil, fmt.Errorf("%w: %w", ErrFailedToUnmarshal, err) + return nil, err } return telemetryArgs, nil } From 617d26190823f7c10b4c124a757824661cf56c74 Mon Sep 17 00:00:00 2001 From: grantdfoster Date: Mon, 27 Oct 2025 20:13:18 +0100 Subject: [PATCH 5/5] chore: update imports --- api/args/base/base.go | 2 +- api/args/generic/generic.go | 4 ++-- api/args/linkedin/linkedin.go | 2 +- api/args/linkedin/profile/profile.go | 14 +++++------ api/args/linkedin/profile/profile_test.go | 14 +++++------ api/args/llm/llm.go | 2 +- api/args/llm/process/process.go | 6 ++--- api/args/llm/process/process_test.go | 2 +- api/args/reddit/reddit.go | 2 +- api/args/reddit/search/search.go | 4 ++-- api/args/reddit/search/search_test.go | 6 ++--- api/args/telemetry/telemetry.go | 4 ++-- api/args/telemetry/telemetry_test.go | 4 ++-- api/args/tiktok/query/query.go | 4 ++-- api/args/tiktok/query/query_test.go | 2 +- api/args/tiktok/tiktok.go | 6 ++--- .../tiktok/transcription/transcription.go | 4 ++-- .../transcription/transcription_test.go | 2 +- api/args/tiktok/trending/trending.go | 6 ++--- api/args/tiktok/trending/trending_test.go | 6 ++--- api/args/twitter/search/search.go | 4 ++-- api/args/twitter/search/search_test.go | 4 ++-- api/args/twitter/twitter.go | 2 +- api/args/unmarshaller.go | 16 ++++++------- api/args/unmarshaller_test.go | 14 +++++------ api/args/web/scraper/scraper.go | 4 ++-- api/args/web/scraper/scraper_test.go | 4 ++-- api/args/web/web.go | 2 +- api/params/base.go | 6 ++--- api/params/generic.go | 2 +- api/params/hybrid.go | 2 +- api/params/linkedin.go | 2 +- api/params/reddit.go | 4 ++-- api/params/similarity.go | 2 +- api/params/tiktok.go | 2 +- api/params/twitter.go | 2 +- api/params/web.go | 2 +- api/tee/encrypted.go | 4 ++-- api/tee/job.go | 4 ++-- api/types/jobs.go | 2 +- api/types/linkedin/experiences/experiences.go | 2 +- api/types/linkedin/functions/functions.go | 2 +- api/types/linkedin/industries/industries.go | 2 +- api/types/linkedin/linkedin.go | 10 ++++---- api/types/linkedin/linkedin_test.go | 10 ++++---- api/types/linkedin/profile/profile.go | 2 +- api/types/linkedin/seniorities/seniorities.go | 2 +- api/types/reddit.go | 2 +- api/types/reddit_test.go | 2 +- api/types/types.go | 2 +- cmd/tee-worker/main.go | 6 ++--- go.mod | 2 +- internal/api/api_test.go | 8 +++---- internal/api/health.go | 2 +- internal/api/health_test.go | 6 ++--- internal/api/middleware.go | 2 +- internal/api/middleware_test.go | 2 +- internal/api/routes.go | 8 +++---- internal/api/start.go | 6 ++--- internal/apify/actors.go | 2 +- internal/capabilities/detector.go | 12 +++++----- internal/capabilities/detector_test.go | 6 ++--- internal/config/config.go | 2 +- internal/jobs/linkedin.go | 18 +++++++------- internal/jobs/linkedin_test.go | 18 +++++++------- internal/jobs/linkedinapify/client.go | 10 ++++---- internal/jobs/linkedinapify/client_test.go | 16 ++++++------- internal/jobs/llmapify/client.go | 12 +++++----- internal/jobs/llmapify/client_test.go | 12 +++++----- internal/jobs/reddit.go | 14 +++++------ internal/jobs/reddit_test.go | 12 +++++----- internal/jobs/redditapify/client.go | 10 ++++---- internal/jobs/redditapify/client_test.go | 10 ++++---- internal/jobs/stats/stats.go | 8 +++---- internal/jobs/telemetry.go | 6 ++--- internal/jobs/telemetry_test.go | 8 +++---- internal/jobs/tiktok.go | 18 +++++++------- internal/jobs/tiktok_test.go | 8 +++---- internal/jobs/tiktokapify/client.go | 10 ++++---- internal/jobs/twitter.go | 20 ++++++++-------- internal/jobs/twitter/account.go | 2 +- internal/jobs/twitter_test.go | 10 ++++---- internal/jobs/twitterapify/client.go | 8 +++---- internal/jobs/twitterx/scraper.go | 2 +- internal/jobs/web.go | 24 +++++++++---------- internal/jobs/web_test.go | 18 +++++++------- internal/jobs/webapify/client.go | 10 ++++---- internal/jobs/webapify/client_test.go | 8 +++---- internal/jobserver/jobserver.go | 12 +++++----- internal/jobserver/jobserver_test.go | 6 ++--- internal/jobserver/result_cache.go | 2 +- internal/jobserver/result_cache_test.go | 2 +- internal/jobserver/worker.go | 2 +- pkg/client/apify_client.go | 2 +- pkg/client/http.go | 2 +- pkg/client/http_test.go | 4 ++-- pkg/util/math_test.go | 2 +- pkg/util/set_test.go | 2 +- 98 files changed, 304 insertions(+), 304 deletions(-) diff --git a/api/args/base/base.go b/api/args/base/base.go index c0b911f9..c0262db7 100644 --- a/api/args/base/base.go +++ b/api/args/base/base.go @@ -1,7 +1,7 @@ package base import ( - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" ) // JobArgument defines the interface that all job arguments must implement diff --git a/api/args/generic/generic.go b/api/args/generic/generic.go index 5bfafc53..9652f68f 100644 --- a/api/args/generic/generic.go +++ b/api/args/generic/generic.go @@ -4,8 +4,8 @@ import ( "encoding/json" "maps" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" ) type Arguments struct { diff --git a/api/args/linkedin/linkedin.go b/api/args/linkedin/linkedin.go index 0dd40b1b..c821bfd4 100644 --- a/api/args/linkedin/linkedin.go +++ b/api/args/linkedin/linkedin.go @@ -1,7 +1,7 @@ package linkedin import ( - "github.com/masa-finance/tee-worker/api/args/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/api/args/linkedin/profile" ) type ProfileArguments = profile.Arguments diff --git a/api/args/linkedin/profile/profile.go b/api/args/linkedin/profile/profile.go index e7f32959..4c27a659 100644 --- a/api/args/linkedin/profile/profile.go +++ b/api/args/linkedin/profile/profile.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/api/types/linkedin/experiences" - "github.com/masa-finance/tee-worker/api/types/linkedin/functions" - "github.com/masa-finance/tee-worker/api/types/linkedin/industries" - "github.com/masa-finance/tee-worker/api/types/linkedin/profile" - "github.com/masa-finance/tee-worker/api/types/linkedin/seniorities" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/experiences" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/functions" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/industries" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/seniorities" ) var ( diff --git a/api/args/linkedin/profile/profile_test.go b/api/args/linkedin/profile/profile_test.go index 1d212e1d..bb98ebc3 100644 --- a/api/args/linkedin/profile/profile_test.go +++ b/api/args/linkedin/profile/profile_test.go @@ -7,13 +7,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/linkedin/profile" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/api/types/linkedin/experiences" - "github.com/masa-finance/tee-worker/api/types/linkedin/functions" - "github.com/masa-finance/tee-worker/api/types/linkedin/industries" - ptypes "github.com/masa-finance/tee-worker/api/types/linkedin/profile" - "github.com/masa-finance/tee-worker/api/types/linkedin/seniorities" + "github.com/masa-finance/tee-worker/v2/api/args/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/experiences" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/functions" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/industries" + ptypes "github.com/masa-finance/tee-worker/v2/api/types/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/seniorities" ) var _ = Describe("LinkedIn Profile Arguments", func() { diff --git a/api/args/llm/llm.go b/api/args/llm/llm.go index fce7831b..3f07534a 100644 --- a/api/args/llm/llm.go +++ b/api/args/llm/llm.go @@ -1,7 +1,7 @@ package llm import ( - "github.com/masa-finance/tee-worker/api/args/llm/process" + "github.com/masa-finance/tee-worker/v2/api/args/llm/process" ) type ProcessArguments = process.Arguments diff --git a/api/args/llm/process/process.go b/api/args/llm/process/process.go index b2619c75..9a7c9663 100644 --- a/api/args/llm/process/process.go +++ b/api/args/llm/process/process.go @@ -6,9 +6,9 @@ import ( "fmt" "strconv" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/pkg/util" ) var ( diff --git a/api/args/llm/process/process_test.go b/api/args/llm/process/process_test.go index c63033cb..55a26e72 100644 --- a/api/args/llm/process/process_test.go +++ b/api/args/llm/process/process_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/llm/process" + "github.com/masa-finance/tee-worker/v2/api/args/llm/process" ) var _ = Describe("LLMProcessorArguments", func() { diff --git a/api/args/reddit/reddit.go b/api/args/reddit/reddit.go index 1ab4df37..65ca75c3 100644 --- a/api/args/reddit/reddit.go +++ b/api/args/reddit/reddit.go @@ -1,7 +1,7 @@ package reddit import ( - "github.com/masa-finance/tee-worker/api/args/reddit/search" + "github.com/masa-finance/tee-worker/v2/api/args/reddit/search" ) type SearchArguments = search.Arguments diff --git a/api/args/reddit/search/search.go b/api/args/reddit/search/search.go index dbb9a575..6e399e6b 100644 --- a/api/args/reddit/search/search.go +++ b/api/args/reddit/search/search.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" ) var ( diff --git a/api/args/reddit/search/search_test.go b/api/args/reddit/search/search_test.go index 27d62d8d..5152f85f 100644 --- a/api/args/reddit/search/search_test.go +++ b/api/args/reddit/search/search_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/reddit" - "github.com/masa-finance/tee-worker/api/args/reddit/search" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/reddit" + "github.com/masa-finance/tee-worker/v2/api/args/reddit/search" + "github.com/masa-finance/tee-worker/v2/api/types" ) var _ = Describe("RedditArguments", func() { diff --git a/api/args/telemetry/telemetry.go b/api/args/telemetry/telemetry.go index 6fe87dfc..540a4cc1 100644 --- a/api/args/telemetry/telemetry.go +++ b/api/args/telemetry/telemetry.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" ) var ( diff --git a/api/args/telemetry/telemetry_test.go b/api/args/telemetry/telemetry_test.go index 888e2857..b9c25608 100644 --- a/api/args/telemetry/telemetry_test.go +++ b/api/args/telemetry/telemetry_test.go @@ -6,8 +6,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/telemetry" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/telemetry" + "github.com/masa-finance/tee-worker/v2/api/types" ) var _ = Describe("Telemetry Arguments", func() { diff --git a/api/args/tiktok/query/query.go b/api/args/tiktok/query/query.go index 855e3a41..f0ef154e 100644 --- a/api/args/tiktok/query/query.go +++ b/api/args/tiktok/query/query.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" ) var ( diff --git a/api/args/tiktok/query/query_test.go b/api/args/tiktok/query/query_test.go index 5c883108..78e62188 100644 --- a/api/args/tiktok/query/query_test.go +++ b/api/args/tiktok/query/query_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/tiktok/query" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/query" ) var _ = Describe("TikTokQueryArguments", func() { diff --git a/api/args/tiktok/tiktok.go b/api/args/tiktok/tiktok.go index 028beffd..0780469b 100644 --- a/api/args/tiktok/tiktok.go +++ b/api/args/tiktok/tiktok.go @@ -1,9 +1,9 @@ package tiktok import ( - "github.com/masa-finance/tee-worker/api/args/tiktok/query" - "github.com/masa-finance/tee-worker/api/args/tiktok/transcription" - "github.com/masa-finance/tee-worker/api/args/tiktok/trending" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/query" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/transcription" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/trending" ) type TranscriptionArguments = transcription.Arguments diff --git a/api/args/tiktok/transcription/transcription.go b/api/args/tiktok/transcription/transcription.go index 4e48fb33..5dab88f4 100644 --- a/api/args/tiktok/transcription/transcription.go +++ b/api/args/tiktok/transcription/transcription.go @@ -7,8 +7,8 @@ import ( "net/url" "strings" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" ) var ( diff --git a/api/args/tiktok/transcription/transcription_test.go b/api/args/tiktok/transcription/transcription_test.go index c4102b9e..eee4c77f 100644 --- a/api/args/tiktok/transcription/transcription_test.go +++ b/api/args/tiktok/transcription/transcription_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/tiktok/transcription" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/transcription" ) var _ = Describe("TikTokTranscriptionArguments", func() { diff --git a/api/args/tiktok/trending/trending.go b/api/args/tiktok/trending/trending.go index 5a7e1a90..6bb0f5d3 100644 --- a/api/args/tiktok/trending/trending.go +++ b/api/args/tiktok/trending/trending.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/pkg/util" ) var ( diff --git a/api/args/tiktok/trending/trending_test.go b/api/args/tiktok/trending/trending_test.go index 2967c7a1..e3673f55 100644 --- a/api/args/tiktok/trending/trending_test.go +++ b/api/args/tiktok/trending/trending_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/tiktok" - "github.com/masa-finance/tee-worker/api/args/tiktok/trending" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/trending" + "github.com/masa-finance/tee-worker/v2/api/types" ) var _ = Describe("TikTokTrendingArguments", func() { diff --git a/api/args/twitter/search/search.go b/api/args/twitter/search/search.go index 03444829..cfc34bd6 100644 --- a/api/args/twitter/search/search.go +++ b/api/args/twitter/search/search.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" ) var ( diff --git a/api/args/twitter/search/search_test.go b/api/args/twitter/search/search_test.go index 5bd35bed..2dc2a2a8 100644 --- a/api/args/twitter/search/search_test.go +++ b/api/args/twitter/search/search_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/twitter/search" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/twitter/search" + "github.com/masa-finance/tee-worker/v2/api/types" ) var _ = Describe("TwitterSearchArguments", func() { diff --git a/api/args/twitter/twitter.go b/api/args/twitter/twitter.go index dc0ddde7..d6769316 100644 --- a/api/args/twitter/twitter.go +++ b/api/args/twitter/twitter.go @@ -1,7 +1,7 @@ package twitter import ( - "github.com/masa-finance/tee-worker/api/args/twitter/search" + "github.com/masa-finance/tee-worker/v2/api/args/twitter/search" ) type SearchArguments = search.Arguments diff --git a/api/args/unmarshaller.go b/api/args/unmarshaller.go index a8a7aaa9..87148e83 100644 --- a/api/args/unmarshaller.go +++ b/api/args/unmarshaller.go @@ -5,14 +5,14 @@ import ( "errors" "fmt" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/args/linkedin" - "github.com/masa-finance/tee-worker/api/args/reddit" - "github.com/masa-finance/tee-worker/api/args/telemetry" - "github.com/masa-finance/tee-worker/api/args/tiktok" - "github.com/masa-finance/tee-worker/api/args/twitter" - "github.com/masa-finance/tee-worker/api/args/web" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/args/linkedin" + "github.com/masa-finance/tee-worker/v2/api/args/reddit" + "github.com/masa-finance/tee-worker/v2/api/args/telemetry" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok" + "github.com/masa-finance/tee-worker/v2/api/args/twitter" + "github.com/masa-finance/tee-worker/v2/api/args/web" + "github.com/masa-finance/tee-worker/v2/api/types" ) var ( diff --git a/api/args/unmarshaller_test.go b/api/args/unmarshaller_test.go index 280d435b..613e7a09 100644 --- a/api/args/unmarshaller_test.go +++ b/api/args/unmarshaller_test.go @@ -4,13 +4,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args" - "github.com/masa-finance/tee-worker/api/args/reddit" - "github.com/masa-finance/tee-worker/api/args/telemetry" - "github.com/masa-finance/tee-worker/api/args/tiktok" - "github.com/masa-finance/tee-worker/api/args/twitter" - "github.com/masa-finance/tee-worker/api/args/web" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args" + "github.com/masa-finance/tee-worker/v2/api/args/reddit" + "github.com/masa-finance/tee-worker/v2/api/args/telemetry" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok" + "github.com/masa-finance/tee-worker/v2/api/args/twitter" + "github.com/masa-finance/tee-worker/v2/api/args/web" + "github.com/masa-finance/tee-worker/v2/api/types" ) var _ = Describe("Unmarshaller", func() { diff --git a/api/args/web/scraper/scraper.go b/api/args/web/scraper/scraper.go index 6c34a5de..95ba1655 100644 --- a/api/args/web/scraper/scraper.go +++ b/api/args/web/scraper/scraper.go @@ -6,8 +6,8 @@ import ( "fmt" "net/url" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" ) var ( diff --git a/api/args/web/scraper/scraper_test.go b/api/args/web/scraper/scraper_test.go index 49632ed8..c462f0e9 100644 --- a/api/args/web/scraper/scraper_test.go +++ b/api/args/web/scraper/scraper_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/web" - "github.com/masa-finance/tee-worker/api/args/web/scraper" + "github.com/masa-finance/tee-worker/v2/api/args/web" + "github.com/masa-finance/tee-worker/v2/api/args/web/scraper" ) var _ = Describe("WebArguments", func() { diff --git a/api/args/web/web.go b/api/args/web/web.go index 9377478c..a77da5ef 100644 --- a/api/args/web/web.go +++ b/api/args/web/web.go @@ -1,7 +1,7 @@ package web import ( - "github.com/masa-finance/tee-worker/api/args/web/scraper" + "github.com/masa-finance/tee-worker/v2/api/args/web/scraper" ) type ScraperArguments = scraper.Arguments diff --git a/api/params/base.go b/api/params/base.go index 18b13927..f059c1a0 100644 --- a/api/params/base.go +++ b/api/params/base.go @@ -4,9 +4,9 @@ import ( "encoding/json" "time" - "github.com/masa-finance/tee-worker/api/args" - "github.com/masa-finance/tee-worker/api/args/base" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args" + "github.com/masa-finance/tee-worker/v2/api/args/base" + "github.com/masa-finance/tee-worker/v2/api/types" ) type JobParameters interface { diff --git a/api/params/generic.go b/api/params/generic.go index 534783f3..0fc00d5a 100644 --- a/api/params/generic.go +++ b/api/params/generic.go @@ -1,5 +1,5 @@ package params -import "github.com/masa-finance/tee-worker/api/args/generic" +import "github.com/masa-finance/tee-worker/v2/api/args/generic" type Generic = Params[*generic.Arguments] diff --git a/api/params/hybrid.go b/api/params/hybrid.go index d8edfa44..593c3242 100644 --- a/api/params/hybrid.go +++ b/api/params/hybrid.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" ) type HybridQuery struct { diff --git a/api/params/linkedin.go b/api/params/linkedin.go index acab908d..14313644 100644 --- a/api/params/linkedin.go +++ b/api/params/linkedin.go @@ -1,7 +1,7 @@ package params import ( - "github.com/masa-finance/tee-worker/api/args/linkedin" + "github.com/masa-finance/tee-worker/v2/api/args/linkedin" ) type LinkedIn = Params[*linkedin.ProfileArguments] diff --git a/api/params/reddit.go b/api/params/reddit.go index 21c121e6..7f40b33a 100644 --- a/api/params/reddit.go +++ b/api/params/reddit.go @@ -3,8 +3,8 @@ package params import ( "time" - "github.com/masa-finance/tee-worker/api/args/reddit" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/args/reddit" + "github.com/masa-finance/tee-worker/v2/api/types" ) type Reddit struct { diff --git a/api/params/similarity.go b/api/params/similarity.go index cbf96a55..efeee355 100644 --- a/api/params/similarity.go +++ b/api/params/similarity.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" ) var _ JobParameters = (*SimilaritySearch)(nil) diff --git a/api/params/tiktok.go b/api/params/tiktok.go index 430541ea..794363b1 100644 --- a/api/params/tiktok.go +++ b/api/params/tiktok.go @@ -1,7 +1,7 @@ package params import ( - "github.com/masa-finance/tee-worker/api/args/tiktok" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok" ) type TikTokTranscription = Params[*tiktok.TranscriptionArguments] diff --git a/api/params/twitter.go b/api/params/twitter.go index c991a7d8..5e399993 100644 --- a/api/params/twitter.go +++ b/api/params/twitter.go @@ -1,7 +1,7 @@ package params import ( - "github.com/masa-finance/tee-worker/api/args/twitter" + "github.com/masa-finance/tee-worker/v2/api/args/twitter" ) type Twitter = Params[*twitter.SearchArguments] diff --git a/api/params/web.go b/api/params/web.go index c5538fdd..db2d42cd 100644 --- a/api/params/web.go +++ b/api/params/web.go @@ -1,7 +1,7 @@ package params import ( - "github.com/masa-finance/tee-worker/api/args/web" + "github.com/masa-finance/tee-worker/v2/api/args/web" ) type Web = Params[*web.ScraperArguments] diff --git a/api/tee/encrypted.go b/api/tee/encrypted.go index aab4ecb1..10b4a219 100644 --- a/api/tee/encrypted.go +++ b/api/tee/encrypted.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/pkg/tee" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/pkg/tee" ) // EncryptedRequest represents an encrypted request/response pair diff --git a/api/tee/job.go b/api/tee/job.go index 21db0077..2345bd94 100644 --- a/api/tee/job.go +++ b/api/tee/job.go @@ -6,8 +6,8 @@ import ( "fmt" "math/rand/v2" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/pkg/tee" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/pkg/tee" ) var letterRunes = []rune("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%^&*()_+") diff --git a/api/types/jobs.go b/api/types/jobs.go index c7ac88ed..84739e59 100644 --- a/api/types/jobs.go +++ b/api/types/jobs.go @@ -7,7 +7,7 @@ import ( "slices" "time" - "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/pkg/util" ) type JobStatus string diff --git a/api/types/linkedin/experiences/experiences.go b/api/types/linkedin/experiences/experiences.go index b339230e..a1dce5c1 100644 --- a/api/types/linkedin/experiences/experiences.go +++ b/api/types/linkedin/experiences/experiences.go @@ -1,6 +1,6 @@ package experiences -import "github.com/masa-finance/tee-worker/pkg/util" +import "github.com/masa-finance/tee-worker/v2/pkg/util" // id represents a LinkedIn experience level identifier type Id string diff --git a/api/types/linkedin/functions/functions.go b/api/types/linkedin/functions/functions.go index 7dd715c3..271bff33 100644 --- a/api/types/linkedin/functions/functions.go +++ b/api/types/linkedin/functions/functions.go @@ -1,6 +1,6 @@ package functions -import "github.com/masa-finance/tee-worker/pkg/util" +import "github.com/masa-finance/tee-worker/v2/pkg/util" // id represents a LinkedIn function identifier type Id string diff --git a/api/types/linkedin/industries/industries.go b/api/types/linkedin/industries/industries.go index 666df4d5..67aec54a 100644 --- a/api/types/linkedin/industries/industries.go +++ b/api/types/linkedin/industries/industries.go @@ -1,6 +1,6 @@ package industries -import "github.com/masa-finance/tee-worker/pkg/util" +import "github.com/masa-finance/tee-worker/v2/pkg/util" // Id represents a LinkedIn industry identifier type Id string diff --git a/api/types/linkedin/linkedin.go b/api/types/linkedin/linkedin.go index c0d3b226..2c6c8694 100644 --- a/api/types/linkedin/linkedin.go +++ b/api/types/linkedin/linkedin.go @@ -1,11 +1,11 @@ package linkedin import ( - "github.com/masa-finance/tee-worker/api/types/linkedin/experiences" - "github.com/masa-finance/tee-worker/api/types/linkedin/functions" - "github.com/masa-finance/tee-worker/api/types/linkedin/industries" - "github.com/masa-finance/tee-worker/api/types/linkedin/profile" - "github.com/masa-finance/tee-worker/api/types/linkedin/seniorities" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/experiences" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/functions" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/industries" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/seniorities" ) type LinkedInConfig struct { diff --git a/api/types/linkedin/linkedin_test.go b/api/types/linkedin/linkedin_test.go index 88c26f0f..251cc651 100644 --- a/api/types/linkedin/linkedin_test.go +++ b/api/types/linkedin/linkedin_test.go @@ -4,11 +4,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/api/types/linkedin/experiences" - "github.com/masa-finance/tee-worker/api/types/linkedin/functions" - "github.com/masa-finance/tee-worker/api/types/linkedin/industries" - "github.com/masa-finance/tee-worker/api/types/linkedin/seniorities" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/experiences" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/functions" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/industries" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/seniorities" ) var _ = Describe("LinkedIn Types", func() { diff --git a/api/types/linkedin/profile/profile.go b/api/types/linkedin/profile/profile.go index 024151d2..eff7e67d 100644 --- a/api/types/linkedin/profile/profile.go +++ b/api/types/linkedin/profile/profile.go @@ -3,7 +3,7 @@ package profile import ( "time" - "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/pkg/util" ) type ScraperMode string diff --git a/api/types/linkedin/seniorities/seniorities.go b/api/types/linkedin/seniorities/seniorities.go index 4382c51b..961711e7 100644 --- a/api/types/linkedin/seniorities/seniorities.go +++ b/api/types/linkedin/seniorities/seniorities.go @@ -1,6 +1,6 @@ package seniorities -import "github.com/masa-finance/tee-worker/pkg/util" +import "github.com/masa-finance/tee-worker/v2/pkg/util" // id represents a LinkedIn seniority level identifier type Id string diff --git a/api/types/reddit.go b/api/types/reddit.go index dec89e4c..a55650c7 100644 --- a/api/types/reddit.go +++ b/api/types/reddit.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/pkg/util" ) var AllRedditQueryTypes = util.NewSet(CapScrapeUrls, CapSearchPosts, CapSearchUsers, CapSearchCommunities) diff --git a/api/types/reddit_test.go b/api/types/reddit_test.go index d31934a5..d6410756 100644 --- a/api/types/reddit_test.go +++ b/api/types/reddit_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" ) var _ = Describe("RedditResponse", func() { diff --git a/api/types/types.go b/api/types/types.go index d6b47ab4..b15340f5 100644 --- a/api/types/types.go +++ b/api/types/types.go @@ -1,7 +1,7 @@ package types import ( - linkedin "github.com/masa-finance/tee-worker/api/types/linkedin" + linkedin "github.com/masa-finance/tee-worker/v2/api/types/linkedin" ) var LinkedIn = linkedin.LinkedIn diff --git a/cmd/tee-worker/main.go b/cmd/tee-worker/main.go index 5a498d06..9dd3726a 100644 --- a/cmd/tee-worker/main.go +++ b/cmd/tee-worker/main.go @@ -3,9 +3,9 @@ package main import ( "context" - "github.com/masa-finance/tee-worker/internal/api" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/pkg/tee" + "github.com/masa-finance/tee-worker/v2/internal/api" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/pkg/tee" "github.com/sirupsen/logrus" ) diff --git a/go.mod b/go.mod index 40bfcd2b..310baa37 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/masa-finance/tee-worker +module github.com/masa-finance/tee-worker/v2 go 1.24.0 diff --git a/internal/api/api_test.go b/internal/api/api_test.go index a946535f..c579eb55 100644 --- a/internal/api/api_test.go +++ b/internal/api/api_test.go @@ -10,10 +10,10 @@ import ( . "github.com/onsi/gomega" "github.com/sirupsen/logrus" - "github.com/masa-finance/tee-worker/api/types" - . "github.com/masa-finance/tee-worker/internal/api" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/types" + . "github.com/masa-finance/tee-worker/v2/internal/api" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) var _ = Describe("API", func() { diff --git a/internal/api/health.go b/internal/api/health.go index adff72a9..13856409 100644 --- a/internal/api/health.go +++ b/internal/api/health.go @@ -6,7 +6,7 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/masa-finance/tee-worker/internal/jobserver" + "github.com/masa-finance/tee-worker/v2/internal/jobserver" ) // HealthMetrics tracks health-related metrics for the service diff --git a/internal/api/health_test.go b/internal/api/health_test.go index 43e7031f..85102bb2 100644 --- a/internal/api/health_test.go +++ b/internal/api/health_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/internal/config" - . "github.com/masa-finance/tee-worker/internal/api" - "github.com/masa-finance/tee-worker/internal/jobserver" + "github.com/masa-finance/tee-worker/v2/internal/config" + . "github.com/masa-finance/tee-worker/v2/internal/api" + "github.com/masa-finance/tee-worker/v2/internal/jobserver" ) var _ = Describe("Health Checks", func() { diff --git a/internal/api/middleware.go b/internal/api/middleware.go index 6cb62656..1be6ecd1 100644 --- a/internal/api/middleware.go +++ b/internal/api/middleware.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/labstack/echo/v4" - "github.com/masa-finance/tee-worker/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/config" ) const HealthCheckPath = "/healthz" diff --git a/internal/api/middleware_test.go b/internal/api/middleware_test.go index ffa05c13..69575bba 100644 --- a/internal/api/middleware_test.go +++ b/internal/api/middleware_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - . "github.com/masa-finance/tee-worker/internal/api" + . "github.com/masa-finance/tee-worker/v2/internal/api" ) var _ = Describe("APIKeyAuthMiddleware", func() { diff --git a/internal/api/routes.go b/internal/api/routes.go index 7fe1b667..45af8128 100644 --- a/internal/api/routes.go +++ b/internal/api/routes.go @@ -5,10 +5,10 @@ import ( "net/http" "github.com/labstack/echo/v4" - teejob "github.com/masa-finance/tee-worker/api/tee" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/jobserver" - "github.com/masa-finance/tee-worker/pkg/tee" + teejob "github.com/masa-finance/tee-worker/v2/api/tee" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/jobserver" + "github.com/masa-finance/tee-worker/v2/pkg/tee" "github.com/sirupsen/logrus" ) diff --git a/internal/api/start.go b/internal/api/start.go index 3bc4fd8f..cf47cad8 100644 --- a/internal/api/start.go +++ b/internal/api/start.go @@ -12,9 +12,9 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" "github.com/labstack/gommon/log" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobserver" - "github.com/masa-finance/tee-worker/pkg/tee" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobserver" + "github.com/masa-finance/tee-worker/v2/pkg/tee" ) func Start(ctx context.Context, listenAddress, dataDIR string, standalone bool, jc config.JobConfiguration) error { diff --git a/internal/apify/actors.go b/internal/apify/actors.go index a349e70b..9e479ccc 100644 --- a/internal/apify/actors.go +++ b/internal/apify/actors.go @@ -1,7 +1,7 @@ package apify import ( - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" ) type ActorId string diff --git a/internal/capabilities/detector.go b/internal/capabilities/detector.go index 03346ac9..4c0ea3d5 100644 --- a/internal/capabilities/detector.go +++ b/internal/capabilities/detector.go @@ -6,12 +6,12 @@ import ( "maps" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/twitter" - "github.com/masa-finance/tee-worker/pkg/client" - util "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/twitter" + "github.com/masa-finance/tee-worker/v2/pkg/client" + util "github.com/masa-finance/tee-worker/v2/pkg/util" "github.com/sirupsen/logrus" ) diff --git a/internal/capabilities/detector_test.go b/internal/capabilities/detector_test.go index 82c017c8..7f8b44b6 100644 --- a/internal/capabilities/detector_test.go +++ b/internal/capabilities/detector_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/types" - . "github.com/masa-finance/tee-worker/internal/capabilities" - "github.com/masa-finance/tee-worker/internal/config" + "github.com/masa-finance/tee-worker/v2/api/types" + . "github.com/masa-finance/tee-worker/v2/internal/capabilities" + "github.com/masa-finance/tee-worker/v2/internal/config" ) // MockJobServer implements JobServerInterface for testing diff --git a/internal/config/config.go b/internal/config/config.go index c5e8938a..60225f3c 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -13,7 +13,7 @@ import ( "github.com/joho/godotenv" "github.com/sirupsen/logrus" - "github.com/masa-finance/tee-worker/api/args/llm/process" + "github.com/masa-finance/tee-worker/v2/api/args/llm/process" ) var ( diff --git a/internal/jobs/linkedin.go b/internal/jobs/linkedin.go index 8a111eb5..9deed6ec 100644 --- a/internal/jobs/linkedin.go +++ b/internal/jobs/linkedin.go @@ -7,15 +7,15 @@ import ( "github.com/sirupsen/logrus" - "github.com/masa-finance/tee-worker/api/args" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/linkedinapify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" - - pArgs "github.com/masa-finance/tee-worker/api/args/linkedin/profile" - pTypes "github.com/masa-finance/tee-worker/api/types/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/api/args" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/linkedinapify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" + + pArgs "github.com/masa-finance/tee-worker/v2/api/args/linkedin/profile" + pTypes "github.com/masa-finance/tee-worker/v2/api/types/linkedin/profile" ) // LinkedInApifyClient defines the interface for the LinkedIn Apify client to allow mocking in tests diff --git a/internal/jobs/linkedin_test.go b/internal/jobs/linkedin_test.go index 4573c6aa..ff0f9d33 100644 --- a/internal/jobs/linkedin_test.go +++ b/internal/jobs/linkedin_test.go @@ -10,15 +10,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs" - "github.com/masa-finance/tee-worker/internal/jobs/linkedinapify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" - - "github.com/masa-finance/tee-worker/api/args/linkedin" - "github.com/masa-finance/tee-worker/api/types/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs" + "github.com/masa-finance/tee-worker/v2/internal/jobs/linkedinapify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" + + "github.com/masa-finance/tee-worker/v2/api/args/linkedin" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/profile" ) // MockLinkedInApifyClient is a mock implementation of the LinkedInApifyClient. diff --git a/internal/jobs/linkedinapify/client.go b/internal/jobs/linkedinapify/client.go index adb55d3f..619c8978 100644 --- a/internal/jobs/linkedinapify/client.go +++ b/internal/jobs/linkedinapify/client.go @@ -4,11 +4,11 @@ import ( "encoding/json" "fmt" - profileArgs "github.com/masa-finance/tee-worker/api/args/linkedin/profile" - profileTypes "github.com/masa-finance/tee-worker/api/types/linkedin/profile" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" + profileArgs "github.com/masa-finance/tee-worker/v2/api/args/linkedin/profile" + profileTypes "github.com/masa-finance/tee-worker/v2/api/types/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/linkedinapify/client_test.go b/internal/jobs/linkedinapify/client_test.go index 9bf2681d..ecd53ccc 100644 --- a/internal/jobs/linkedinapify/client_test.go +++ b/internal/jobs/linkedinapify/client_test.go @@ -8,14 +8,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/jobs/linkedinapify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" - - profileArgs "github.com/masa-finance/tee-worker/api/args/linkedin/profile" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/api/types/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/linkedinapify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" + + profileArgs "github.com/masa-finance/tee-worker/v2/api/args/linkedin/profile" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/api/types/linkedin/profile" ) // MockApifyClient is a mock implementation of the ApifyClient. diff --git a/internal/jobs/llmapify/client.go b/internal/jobs/llmapify/client.go index e8694a27..adc50f06 100644 --- a/internal/jobs/llmapify/client.go +++ b/internal/jobs/llmapify/client.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "github.com/masa-finance/tee-worker/api/args/llm" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args/llm" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/llmapify/client_test.go b/internal/jobs/llmapify/client_test.go index 69497c79..c7de7339 100644 --- a/internal/jobs/llmapify/client_test.go +++ b/internal/jobs/llmapify/client_test.go @@ -10,12 +10,12 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/llm/process" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/llmapify" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args/llm/process" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/llmapify" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) // MockApifyClient is a mock implementation of the ApifyClient. diff --git a/internal/jobs/reddit.go b/internal/jobs/reddit.go index 4404288c..fbd29886 100644 --- a/internal/jobs/reddit.go +++ b/internal/jobs/reddit.go @@ -9,13 +9,13 @@ import ( "github.com/sirupsen/logrus" - "github.com/masa-finance/tee-worker/api/args" - "github.com/masa-finance/tee-worker/api/args/reddit/search" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/redditapify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args" + "github.com/masa-finance/tee-worker/v2/api/args/reddit/search" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/redditapify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) // RedditApifyClient defines the interface for the Reddit Apify client. diff --git a/internal/jobs/reddit_test.go b/internal/jobs/reddit_test.go index 344dbf8d..4f7b13c7 100644 --- a/internal/jobs/reddit_test.go +++ b/internal/jobs/reddit_test.go @@ -9,12 +9,12 @@ import ( . "github.com/onsi/gomega" "github.com/sirupsen/logrus" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs" - "github.com/masa-finance/tee-worker/internal/jobs/redditapify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs" + "github.com/masa-finance/tee-worker/v2/internal/jobs/redditapify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) // MockRedditApifyClient is a mock implementation of the RedditApifyClient. diff --git a/internal/jobs/redditapify/client.go b/internal/jobs/redditapify/client.go index 79f23439..545537dc 100644 --- a/internal/jobs/redditapify/client.go +++ b/internal/jobs/redditapify/client.go @@ -7,11 +7,11 @@ import ( "github.com/sirupsen/logrus" - "github.com/masa-finance/tee-worker/api/args/reddit/search" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args/reddit/search" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) // CommonArgs holds the parameters that all Reddit searches support, in a single struct diff --git a/internal/jobs/redditapify/client_test.go b/internal/jobs/redditapify/client_test.go index 3a3d59ac..71a7710e 100644 --- a/internal/jobs/redditapify/client_test.go +++ b/internal/jobs/redditapify/client_test.go @@ -8,11 +8,11 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/reddit/search" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/jobs/redditapify" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args/reddit/search" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/redditapify" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) // MockApifyClient is a mock implementation of the ApifyClient. diff --git a/internal/jobs/stats/stats.go b/internal/jobs/stats/stats.go index 85f1bd5d..f4ec57d3 100644 --- a/internal/jobs/stats/stats.go +++ b/internal/jobs/stats/stats.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/capabilities" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/versioning" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/capabilities" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/versioning" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/telemetry.go b/internal/jobs/telemetry.go index db92afa6..863b2be5 100644 --- a/internal/jobs/telemetry.go +++ b/internal/jobs/telemetry.go @@ -1,9 +1,9 @@ package jobs import ( - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/telemetry_test.go b/internal/jobs/telemetry_test.go index 2a8960a9..036df263 100644 --- a/internal/jobs/telemetry_test.go +++ b/internal/jobs/telemetry_test.go @@ -8,10 +8,10 @@ import ( . "github.com/onsi/gomega" "github.com/sirupsen/logrus" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - . "github.com/masa-finance/tee-worker/internal/jobs" - "github.com/masa-finance/tee-worker/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + . "github.com/masa-finance/tee-worker/v2/internal/jobs" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" ) var _ = Describe("Telemetry Job", func() { diff --git a/internal/jobs/tiktok.go b/internal/jobs/tiktok.go index a3c8b223..6ea3fb68 100644 --- a/internal/jobs/tiktok.go +++ b/internal/jobs/tiktok.go @@ -10,15 +10,15 @@ import ( "strings" "time" - "github.com/masa-finance/tee-worker/api/args" - "github.com/masa-finance/tee-worker/api/args/tiktok/query" - "github.com/masa-finance/tee-worker/api/args/tiktok/transcription" - "github.com/masa-finance/tee-worker/api/args/tiktok/trending" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/internal/jobs/tiktokapify" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/query" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/transcription" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/trending" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/internal/jobs/tiktokapify" + "github.com/masa-finance/tee-worker/v2/pkg/client" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/tiktok_test.go b/internal/jobs/tiktok_test.go index 5c9b5f44..65321907 100644 --- a/internal/jobs/tiktok_test.go +++ b/internal/jobs/tiktok_test.go @@ -10,10 +10,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - . "github.com/masa-finance/tee-worker/internal/jobs" - "github.com/masa-finance/tee-worker/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + . "github.com/masa-finance/tee-worker/v2/internal/jobs" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/tiktokapify/client.go b/internal/jobs/tiktokapify/client.go index 48c9b077..46cc02d7 100644 --- a/internal/jobs/tiktokapify/client.go +++ b/internal/jobs/tiktokapify/client.go @@ -4,11 +4,11 @@ import ( "encoding/json" "fmt" - "github.com/masa-finance/tee-worker/api/args/tiktok/query" - "github.com/masa-finance/tee-worker/api/args/tiktok/trending" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/query" + "github.com/masa-finance/tee-worker/v2/api/args/tiktok/trending" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) type TikTokSearchByQueryRequest struct { diff --git a/internal/jobs/twitter.go b/internal/jobs/twitter.go index 8c3e7e79..603982b3 100644 --- a/internal/jobs/twitter.go +++ b/internal/jobs/twitter.go @@ -8,16 +8,16 @@ import ( "strings" "time" - "github.com/masa-finance/tee-worker/internal/jobs/twitterx" - "github.com/masa-finance/tee-worker/pkg/client" - - "github.com/masa-finance/tee-worker/api/args" - twitterargs "github.com/masa-finance/tee-worker/api/args/twitter" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/internal/jobs/twitter" - "github.com/masa-finance/tee-worker/internal/jobs/twitterapify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/twitterx" + "github.com/masa-finance/tee-worker/v2/pkg/client" + + "github.com/masa-finance/tee-worker/v2/api/args" + twitterargs "github.com/masa-finance/tee-worker/v2/api/args/twitter" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/internal/jobs/twitter" + "github.com/masa-finance/tee-worker/v2/internal/jobs/twitterapify" twitterscraper "github.com/imperatrona/twitter-scraper" "github.com/sirupsen/logrus" diff --git a/internal/jobs/twitter/account.go b/internal/jobs/twitter/account.go index 121959f1..62de801a 100644 --- a/internal/jobs/twitter/account.go +++ b/internal/jobs/twitter/account.go @@ -2,7 +2,7 @@ package twitter import ( "fmt" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/pkg/client" "strings" "sync" "time" diff --git a/internal/jobs/twitter_test.go b/internal/jobs/twitter_test.go index b5fb7307..cdb78869 100644 --- a/internal/jobs/twitter_test.go +++ b/internal/jobs/twitter_test.go @@ -12,11 +12,11 @@ import ( "github.com/sirupsen/logrus" twitterscraper "github.com/imperatrona/twitter-scraper" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - . "github.com/masa-finance/tee-worker/internal/jobs" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/internal/jobs/twitterx" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + . "github.com/masa-finance/tee-worker/v2/internal/jobs" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/internal/jobs/twitterx" ) // parseTwitterAccounts parses TWITTER_ACCOUNTS environment variable like production does diff --git a/internal/jobs/twitterapify/client.go b/internal/jobs/twitterapify/client.go index 27356dd9..8137ac9e 100644 --- a/internal/jobs/twitterapify/client.go +++ b/internal/jobs/twitterapify/client.go @@ -4,10 +4,10 @@ import ( "encoding/json" "fmt" - "github.com/masa-finance/tee-worker/api/types" - util "github.com/masa-finance/tee-worker/pkg/util" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/types" + util "github.com/masa-finance/tee-worker/v2/pkg/util" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/pkg/client" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/twitterx/scraper.go b/internal/jobs/twitterx/scraper.go index 2d5ba49a..89562920 100644 --- a/internal/jobs/twitterx/scraper.go +++ b/internal/jobs/twitterx/scraper.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/pkg/client" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/web.go b/internal/jobs/web.go index 5c72362f..40ccecd2 100644 --- a/internal/jobs/web.go +++ b/internal/jobs/web.go @@ -7,18 +7,18 @@ import ( "github.com/sirupsen/logrus" - "github.com/masa-finance/tee-worker/api/args" - "github.com/masa-finance/tee-worker/api/args/llm" - "github.com/masa-finance/tee-worker/api/args/llm/process" - "github.com/masa-finance/tee-worker/api/args/web" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs/llmapify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/internal/jobs/webapify" - "github.com/masa-finance/tee-worker/pkg/client" - - "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/api/args" + "github.com/masa-finance/tee-worker/v2/api/args/llm" + "github.com/masa-finance/tee-worker/v2/api/args/llm/process" + "github.com/masa-finance/tee-worker/v2/api/args/web" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs/llmapify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/internal/jobs/webapify" + "github.com/masa-finance/tee-worker/v2/pkg/client" + + "github.com/masa-finance/tee-worker/v2/pkg/util" ) // WebApifyClient defines the interface for the Web Apify client to allow mocking in tests diff --git a/internal/jobs/web_test.go b/internal/jobs/web_test.go index 9a75909a..011192ef 100644 --- a/internal/jobs/web_test.go +++ b/internal/jobs/web_test.go @@ -8,15 +8,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/llm" - "github.com/masa-finance/tee-worker/api/args/web" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs" - "github.com/masa-finance/tee-worker/internal/jobs/llmapify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/internal/jobs/webapify" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args/llm" + "github.com/masa-finance/tee-worker/v2/api/args/web" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs" + "github.com/masa-finance/tee-worker/v2/internal/jobs/llmapify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/internal/jobs/webapify" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) // MockWebApifyClient is a mock implementation of the WebApifyClient. diff --git a/internal/jobs/webapify/client.go b/internal/jobs/webapify/client.go index ef6995f4..01329e4b 100644 --- a/internal/jobs/webapify/client.go +++ b/internal/jobs/webapify/client.go @@ -4,11 +4,11 @@ import ( "encoding/json" "fmt" - "github.com/masa-finance/tee-worker/api/args/web" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args/web" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/client" "github.com/sirupsen/logrus" ) diff --git a/internal/jobs/webapify/client_test.go b/internal/jobs/webapify/client_test.go index dd622fb4..fb9d2e7f 100644 --- a/internal/jobs/webapify/client_test.go +++ b/internal/jobs/webapify/client_test.go @@ -8,10 +8,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/args/web" - "github.com/masa-finance/tee-worker/internal/apify" - "github.com/masa-finance/tee-worker/internal/jobs/webapify" - "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/args/web" + "github.com/masa-finance/tee-worker/v2/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/jobs/webapify" + "github.com/masa-finance/tee-worker/v2/pkg/client" ) // MockApifyClient is a mock implementation of the ApifyClient. diff --git a/internal/jobserver/jobserver.go b/internal/jobserver/jobserver.go index 3bb3a093..3774bc29 100644 --- a/internal/jobserver/jobserver.go +++ b/internal/jobserver/jobserver.go @@ -10,12 +10,12 @@ import ( "github.com/sirupsen/logrus" "github.com/google/uuid" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/capabilities" - "github.com/masa-finance/tee-worker/internal/config" - "github.com/masa-finance/tee-worker/internal/jobs" - "github.com/masa-finance/tee-worker/internal/jobs/stats" - "github.com/masa-finance/tee-worker/pkg/tee" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/capabilities" + "github.com/masa-finance/tee-worker/v2/internal/config" + "github.com/masa-finance/tee-worker/v2/internal/jobs" + "github.com/masa-finance/tee-worker/v2/internal/jobs/stats" + "github.com/masa-finance/tee-worker/v2/pkg/tee" ) type JobServer struct { diff --git a/internal/jobserver/jobserver_test.go b/internal/jobserver/jobserver_test.go index adce7e9d..996e8a6a 100644 --- a/internal/jobserver/jobserver_test.go +++ b/internal/jobserver/jobserver_test.go @@ -9,9 +9,9 @@ import ( . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/api/types" - "github.com/masa-finance/tee-worker/internal/config" - . "github.com/masa-finance/tee-worker/internal/jobserver" + "github.com/masa-finance/tee-worker/v2/api/types" + "github.com/masa-finance/tee-worker/v2/internal/config" + . "github.com/masa-finance/tee-worker/v2/internal/jobserver" ) var _ = Describe("Jobserver", func() { diff --git a/internal/jobserver/result_cache.go b/internal/jobserver/result_cache.go index 33cffbc5..64473551 100644 --- a/internal/jobserver/result_cache.go +++ b/internal/jobserver/result_cache.go @@ -2,7 +2,7 @@ package jobserver import ( "container/list" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" "sync" "time" ) diff --git a/internal/jobserver/result_cache_test.go b/internal/jobserver/result_cache_test.go index 21c5d529..9b5b83ed 100644 --- a/internal/jobserver/result_cache_test.go +++ b/internal/jobserver/result_cache_test.go @@ -3,7 +3,7 @@ package jobserver import ( "time" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/internal/jobserver/worker.go b/internal/jobserver/worker.go index 3d19edbf..e7d4be3a 100644 --- a/internal/jobserver/worker.go +++ b/internal/jobserver/worker.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/client/apify_client.go b/pkg/client/apify_client.go index 589ecb3f..5f3edcbb 100644 --- a/pkg/client/apify_client.go +++ b/pkg/client/apify_client.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/masa-finance/tee-worker/internal/apify" + "github.com/masa-finance/tee-worker/v2/internal/apify" "github.com/sirupsen/logrus" ) diff --git a/pkg/client/http.go b/pkg/client/http.go index 50ace989..a8cccccc 100644 --- a/pkg/client/http.go +++ b/pkg/client/http.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/masa-finance/tee-worker/api/types" + "github.com/masa-finance/tee-worker/v2/api/types" ) // Client represents a client to interact with the job server. diff --git a/pkg/client/http_test.go b/pkg/client/http_test.go index e49bc3ac..fca04bc3 100644 --- a/pkg/client/http_test.go +++ b/pkg/client/http_test.go @@ -5,8 +5,8 @@ import ( "net/http" "net/http/httptest" - "github.com/masa-finance/tee-worker/api/types" - . "github.com/masa-finance/tee-worker/pkg/client" + "github.com/masa-finance/tee-worker/v2/api/types" + . "github.com/masa-finance/tee-worker/v2/pkg/client" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/util/math_test.go b/pkg/util/math_test.go index 3213360a..4dbd92bd 100644 --- a/pkg/util/math_test.go +++ b/pkg/util/math_test.go @@ -4,7 +4,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/pkg/util" ) var _ = Describe("Math functions", func() { diff --git a/pkg/util/set_test.go b/pkg/util/set_test.go index a096a451..fd0322df 100644 --- a/pkg/util/set_test.go +++ b/pkg/util/set_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/masa-finance/tee-worker/pkg/util" + "github.com/masa-finance/tee-worker/v2/pkg/util" ) var _ = Describe("Set", func() {