From d808af796107a3e0f7e2619799db6bfe57ab6481 Mon Sep 17 00:00:00 2001 From: Camden Cheek Date: Wed, 5 Jul 2023 11:55:09 -0600 Subject: [PATCH] Embeddings: move out of enterprise (#54621) This moves `enterprise/internal/embeddings` to `internal/embeddings` to simplify organization after the license changes --- enterprise/cmd/embeddings/qa/BUILD.bazel | 2 +- .../embeddings/qa/embed_queries/BUILD.bazel | 2 +- .../cmd/embeddings/qa/embed_queries/main.go | 2 +- enterprise/cmd/embeddings/qa/eval.go | 2 +- enterprise/cmd/embeddings/shared/BUILD.bazel | 10 +++++----- enterprise/cmd/embeddings/shared/config.go | 2 +- .../cmd/embeddings/shared/context_qa_test.go | 2 +- enterprise/cmd/embeddings/shared/main.go | 6 +++--- enterprise/cmd/embeddings/shared/main_test.go | 2 +- .../shared/repo_embedding_index_cache.go | 4 ++-- .../shared/repo_embedding_index_cache_test.go | 4 ++-- enterprise/cmd/embeddings/shared/search.go | 2 +- enterprise/cmd/embeddings/shared/weaviate.go | 2 +- .../internal/app/resolvers/BUILD.bazel | 6 +++--- .../cmd/frontend/internal/app/resolvers/app.go | 4 ++-- .../internal/app/resolvers/progress.go | 2 +- .../internal/app/resolvers/progress_test.go | 2 +- .../cmd/frontend/internal/context/BUILD.bazel | 2 +- .../cmd/frontend/internal/context/init.go | 2 +- .../internal/context/resolvers/BUILD.bazel | 2 +- .../internal/context/resolvers/context_test.go | 2 +- .../frontend/internal/embeddings/BUILD.bazel | 4 ++-- .../cmd/frontend/internal/embeddings/init.go | 4 ++-- .../internal/embeddings/resolvers/BUILD.bazel | 8 ++++---- .../resolvers/repo_embedding_jobs.go | 2 +- .../internal/embeddings/resolvers/resolvers.go | 4 ++-- .../embeddings/resolvers/resolvers_test.go | 4 ++-- .../internal/embeddings/repo/BUILD.bazel | 8 ++++---- .../worker/internal/embeddings/repo/handler.go | 6 +++--- .../internal/embeddings/repo/handler_test.go | 2 +- .../worker/internal/embeddings/repo/janitor.go | 2 +- .../internal/embeddings/repo/scheduler.go | 4 ++-- .../worker/internal/embeddings/repo/worker.go | 6 +++--- enterprise/internal/codycontext/BUILD.bazel | 4 ++-- enterprise/internal/codycontext/context.go | 4 ++-- .../embeddings/embed/client/BUILD.bazel | 8 -------- internal/database/external_services_test.go | 4 ++-- .../embeddings/BUILD.bazel | 8 ++++---- .../embeddings/background/repo/BUILD.bazel | 2 +- .../embeddings/background/repo/mocks_temp.go | 2 +- .../embeddings/background/repo/store.go | 0 .../embeddings/background/repo/store_test.go | 0 .../embeddings/background/repo/types.go | 0 .../internal => internal}/embeddings/client.go | 0 .../internal => internal}/embeddings/dot.go | 0 .../embeddings/dot_amd64.go | 0 .../embeddings/dot_amd64.s | 0 .../embeddings/dot_arm64.go | 0 .../embeddings/dot_arm64.s | 0 .../embeddings/dot_portable.go | 0 .../embeddings/dot_test.go | 0 .../embeddings/embed/BUILD.bazel | 18 +++++++++--------- internal/embeddings/embed/client/BUILD.bazel | 8 ++++++++ .../embeddings/embed/client/client.go | 0 .../embeddings/embed/client/openai/BUILD.bazel | 4 ++-- .../embeddings/embed/client/openai/client.go | 0 .../embed/client/openai/client_test.go | 0 .../embed/client/sourcegraph/BUILD.bazel | 6 +++--- .../embed/client/sourcegraph/client.go | 2 +- .../embeddings/embed/embed.go | 10 +++++----- .../embeddings/embed/embed_test.go | 4 ++-- .../embeddings/embed/files.go | 0 .../embeddings/embed/files_test.go | 0 .../embeddings/embed/iface.go | 0 .../embeddings/embed/mocks_test.go | 4 ++-- .../embeddings/index_name.go | 0 .../embeddings/index_storage.go | 0 .../embeddings/index_storage_test.go | 0 .../embeddings/mocks_temp.go | 5 ++--- .../embeddings/quantize.go | 0 .../embeddings/schedule.go | 2 +- .../embeddings/schedule_test.go | 2 +- .../embeddings/similarity_search.go | 0 .../embeddings/similarity_search_test.go | 0 .../generate_similarity_search_test_data.py | 0 .../internal => internal}/embeddings/types.go | 0 .../embeddings/types_test.go | 0 .../embeddings/uploadstore.go | 0 mockgen.temp.yaml | 8 ++++---- mockgen.test.yaml | 4 ++-- sg.config.yaml | 2 +- 81 files changed, 114 insertions(+), 115 deletions(-) delete mode 100644 enterprise/internal/embeddings/embed/client/BUILD.bazel rename {enterprise/internal => internal}/embeddings/BUILD.bazel (89%) rename {enterprise/internal => internal}/embeddings/background/repo/BUILD.bazel (92%) rename {enterprise/internal => internal}/embeddings/background/repo/mocks_temp.go (99%) rename {enterprise/internal => internal}/embeddings/background/repo/store.go (100%) rename {enterprise/internal => internal}/embeddings/background/repo/store_test.go (100%) rename {enterprise/internal => internal}/embeddings/background/repo/types.go (100%) rename {enterprise/internal => internal}/embeddings/client.go (100%) rename {enterprise/internal => internal}/embeddings/dot.go (100%) rename {enterprise/internal => internal}/embeddings/dot_amd64.go (100%) rename {enterprise/internal => internal}/embeddings/dot_amd64.s (100%) rename {enterprise/internal => internal}/embeddings/dot_arm64.go (100%) rename {enterprise/internal => internal}/embeddings/dot_arm64.s (100%) rename {enterprise/internal => internal}/embeddings/dot_portable.go (100%) rename {enterprise/internal => internal}/embeddings/dot_test.go (100%) rename {enterprise/internal => internal}/embeddings/embed/BUILD.bazel (62%) create mode 100644 internal/embeddings/embed/client/BUILD.bazel rename {enterprise/internal => internal}/embeddings/embed/client/client.go (100%) rename {enterprise/internal => internal}/embeddings/embed/client/openai/BUILD.bazel (73%) rename {enterprise/internal => internal}/embeddings/embed/client/openai/client.go (100%) rename {enterprise/internal => internal}/embeddings/embed/client/openai/client_test.go (100%) rename {enterprise/internal => internal}/embeddings/embed/client/sourcegraph/BUILD.bazel (54%) rename {enterprise/internal => internal}/embeddings/embed/client/sourcegraph/client.go (98%) rename {enterprise/internal => internal}/embeddings/embed/embed.go (95%) rename {enterprise/internal => internal}/embeddings/embed/embed_test.go (98%) rename {enterprise/internal => internal}/embeddings/embed/files.go (100%) rename {enterprise/internal => internal}/embeddings/embed/files_test.go (100%) rename {enterprise/internal => internal}/embeddings/embed/iface.go (100%) rename {enterprise/internal => internal}/embeddings/embed/mocks_test.go (98%) rename {enterprise/internal => internal}/embeddings/index_name.go (100%) rename {enterprise/internal => internal}/embeddings/index_storage.go (100%) rename {enterprise/internal => internal}/embeddings/index_storage_test.go (100%) rename {enterprise/internal => internal}/embeddings/mocks_temp.go (99%) rename {enterprise/internal => internal}/embeddings/quantize.go (100%) rename {enterprise/internal => internal}/embeddings/schedule.go (95%) rename {enterprise/internal => internal}/embeddings/schedule_test.go (95%) rename {enterprise/internal => internal}/embeddings/similarity_search.go (100%) rename {enterprise/internal => internal}/embeddings/similarity_search_test.go (100%) rename {enterprise/internal => internal}/embeddings/testdata/generate_similarity_search_test_data.py (100%) rename {enterprise/internal => internal}/embeddings/types.go (100%) rename {enterprise/internal => internal}/embeddings/types_test.go (100%) rename {enterprise/internal => internal}/embeddings/uploadstore.go (100%) diff --git a/enterprise/cmd/embeddings/qa/BUILD.bazel b/enterprise/cmd/embeddings/qa/BUILD.bazel index 8521ec2fbb5..26224141b70 100644 --- a/enterprise/cmd/embeddings/qa/BUILD.bazel +++ b/enterprise/cmd/embeddings/qa/BUILD.bazel @@ -7,8 +7,8 @@ go_library( importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/qa", visibility = ["//visibility:public"], deps = [ - "//enterprise/internal/embeddings", "//internal/api", + "//internal/embeddings", "//lib/errors", ], ) diff --git a/enterprise/cmd/embeddings/qa/embed_queries/BUILD.bazel b/enterprise/cmd/embeddings/qa/embed_queries/BUILD.bazel index 3c123839311..ef893c94608 100644 --- a/enterprise/cmd/embeddings/qa/embed_queries/BUILD.bazel +++ b/enterprise/cmd/embeddings/qa/embed_queries/BUILD.bazel @@ -6,8 +6,8 @@ go_library( importpath = "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/qa/embed_queries", visibility = ["//visibility:private"], deps = [ - "//enterprise/internal/embeddings/embed", "//internal/conf", + "//internal/embeddings/embed", "//internal/jsonc", "//lib/errors", "//schema", diff --git a/enterprise/cmd/embeddings/qa/embed_queries/main.go b/enterprise/cmd/embeddings/qa/embed_queries/main.go index 865905d368d..d243389d184 100644 --- a/enterprise/cmd/embeddings/qa/embed_queries/main.go +++ b/enterprise/cmd/embeddings/qa/embed_queries/main.go @@ -24,8 +24,8 @@ import ( "path/filepath" "strings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/conf" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/jsonc" "github.com/sourcegraph/sourcegraph/lib/errors" "github.com/sourcegraph/sourcegraph/schema" diff --git a/enterprise/cmd/embeddings/qa/eval.go b/enterprise/cmd/embeddings/qa/eval.go index 31345bf18d2..bce4ac6cce4 100644 --- a/enterprise/cmd/embeddings/qa/eval.go +++ b/enterprise/cmd/embeddings/qa/eval.go @@ -10,8 +10,8 @@ import ( "net/http" "strings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/api" + "github.com/sourcegraph/sourcegraph/internal/embeddings" "github.com/sourcegraph/sourcegraph/lib/errors" ) diff --git a/enterprise/cmd/embeddings/shared/BUILD.bazel b/enterprise/cmd/embeddings/shared/BUILD.bazel index 3edb878f913..694fe6061da 100644 --- a/enterprise/cmd/embeddings/shared/BUILD.bazel +++ b/enterprise/cmd/embeddings/shared/BUILD.bazel @@ -20,9 +20,6 @@ go_library( "//enterprise/internal/authz", "//enterprise/internal/authz/subrepoperms", "//enterprise/internal/database", - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/background/repo", - "//enterprise/internal/embeddings/embed", "//internal/actor", "//internal/api", "//internal/authz", @@ -31,6 +28,9 @@ go_library( "//internal/database", "//internal/database/connections/live", "//internal/debugserver", + "//internal/embeddings", + "//internal/embeddings/background/repo", + "//internal/embeddings/embed", "//internal/env", "//internal/errcode", "//internal/featureflag", @@ -89,10 +89,10 @@ go_test( ], # keep deps = [ "//enterprise/cmd/embeddings/qa", - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/background/repo", "//internal/api", "//internal/database", + "//internal/embeddings", + "//internal/embeddings/background/repo", "//internal/endpoint", "//internal/types", "//internal/uploadstore/mocks", diff --git a/enterprise/cmd/embeddings/shared/config.go b/enterprise/cmd/embeddings/shared/config.go index 21d80b7c180..0f1dc2ae60a 100644 --- a/enterprise/cmd/embeddings/shared/config.go +++ b/enterprise/cmd/embeddings/shared/config.go @@ -6,7 +6,7 @@ import ( "github.com/sourcegraph/sourcegraph/lib/errors" - emb "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" + emb "github.com/sourcegraph/sourcegraph/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/env" ) diff --git a/enterprise/cmd/embeddings/shared/context_qa_test.go b/enterprise/cmd/embeddings/shared/context_qa_test.go index ee6381f0461..c5d9ff2789e 100644 --- a/enterprise/cmd/embeddings/shared/context_qa_test.go +++ b/enterprise/cmd/embeddings/shared/context_qa_test.go @@ -14,8 +14,8 @@ import ( "testing" "github.com/sourcegraph/sourcegraph/enterprise/cmd/embeddings/qa" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/api" + "github.com/sourcegraph/sourcegraph/internal/embeddings" uploadstoremocks "github.com/sourcegraph/sourcegraph/internal/uploadstore/mocks" "github.com/sourcegraph/sourcegraph/lib/errors" ) diff --git a/enterprise/cmd/embeddings/shared/main.go b/enterprise/cmd/embeddings/shared/main.go index e83fa1f4346..7abf798865d 100644 --- a/enterprise/cmd/embeddings/shared/main.go +++ b/enterprise/cmd/embeddings/shared/main.go @@ -11,20 +11,20 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/globals" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/lib/errors" eiauthz "github.com/sourcegraph/sourcegraph/enterprise/internal/authz" srp "github.com/sourcegraph/sourcegraph/enterprise/internal/authz/subrepoperms" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" connections "github.com/sourcegraph/sourcegraph/internal/database/connections/live" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/errcode" "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/goroutine" diff --git a/enterprise/cmd/embeddings/shared/main_test.go b/enterprise/cmd/embeddings/shared/main_test.go index a5a074a52ed..d07ff83a798 100644 --- a/enterprise/cmd/embeddings/shared/main_test.go +++ b/enterprise/cmd/embeddings/shared/main_test.go @@ -9,8 +9,8 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/api" + "github.com/sourcegraph/sourcegraph/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/endpoint" ) diff --git a/enterprise/cmd/embeddings/shared/repo_embedding_index_cache.go b/enterprise/cmd/embeddings/shared/repo_embedding_index_cache.go index 54fe3265b28..73e54edb72d 100644 --- a/enterprise/cmd/embeddings/shared/repo_embedding_index_cache.go +++ b/enterprise/cmd/embeddings/shared/repo_embedding_index_cache.go @@ -13,10 +13,10 @@ import ( "github.com/sourcegraph/sourcegraph/lib/errors" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/trace" ) diff --git a/enterprise/cmd/embeddings/shared/repo_embedding_index_cache_test.go b/enterprise/cmd/embeddings/shared/repo_embedding_index_cache_test.go index f69219ddbe5..f199d26bd05 100644 --- a/enterprise/cmd/embeddings/shared/repo_embedding_index_cache_test.go +++ b/enterprise/cmd/embeddings/shared/repo_embedding_index_cache_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/types" ) diff --git a/enterprise/cmd/embeddings/shared/search.go b/enterprise/cmd/embeddings/shared/search.go index a51d79359ba..060159ada05 100644 --- a/enterprise/cmd/embeddings/shared/search.go +++ b/enterprise/cmd/embeddings/shared/search.go @@ -6,8 +6,8 @@ import ( "go.opentelemetry.io/otel/attribute" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/api" + "github.com/sourcegraph/sourcegraph/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/trace" "github.com/sourcegraph/sourcegraph/lib/errors" ) diff --git a/enterprise/cmd/embeddings/shared/weaviate.go b/enterprise/cmd/embeddings/shared/weaviate.go index 2f11f88558d..ae796752c92 100644 --- a/enterprise/cmd/embeddings/shared/weaviate.go +++ b/enterprise/cmd/embeddings/shared/weaviate.go @@ -11,8 +11,8 @@ import ( "github.com/weaviate/weaviate-go-client/v4/weaviate/graphql" "github.com/weaviate/weaviate/entities/models" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/api" + "github.com/sourcegraph/sourcegraph/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/lib/errors" ) diff --git a/enterprise/cmd/frontend/internal/app/resolvers/BUILD.bazel b/enterprise/cmd/frontend/internal/app/resolvers/BUILD.bazel index e78121635ca..c33d6a96de6 100644 --- a/enterprise/cmd/frontend/internal/app/resolvers/BUILD.bazel +++ b/enterprise/cmd/frontend/internal/app/resolvers/BUILD.bazel @@ -13,13 +13,13 @@ go_library( "//cmd/frontend/backend", "//cmd/frontend/envvar", "//cmd/frontend/graphqlbackend", - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/background/repo", "//internal/api", "//internal/api/internalapi", "//internal/auth", "//internal/conf", "//internal/database", + "//internal/embeddings", + "//internal/embeddings/background/repo", "//internal/extsvc", "//internal/gitserver", "//internal/httpcli", @@ -40,7 +40,7 @@ go_test( srcs = ["progress_test.go"], embed = [":resolvers"], deps = [ - "//enterprise/internal/embeddings/background/repo", + "//internal/embeddings/background/repo", "//lib/pointers", ], ) diff --git a/enterprise/cmd/frontend/internal/app/resolvers/app.go b/enterprise/cmd/frontend/internal/app/resolvers/app.go index f2c1ef09e32..59cb174d084 100644 --- a/enterprise/cmd/frontend/internal/app/resolvers/app.go +++ b/enterprise/cmd/frontend/internal/app/resolvers/app.go @@ -19,13 +19,13 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/backend" "github.com/sourcegraph/sourcegraph/cmd/frontend/envvar" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/api/internalapi" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/httpcli" diff --git a/enterprise/cmd/frontend/internal/app/resolvers/progress.go b/enterprise/cmd/frontend/internal/app/resolvers/progress.go index 3f0815a41a3..95454f1998d 100644 --- a/enterprise/cmd/frontend/internal/app/resolvers/progress.go +++ b/enterprise/cmd/frontend/internal/app/resolvers/progress.go @@ -5,8 +5,8 @@ import ( "math" "sync" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/types" "github.com/sourcegraph/sourcegraph/lib/pointers" ) diff --git a/enterprise/cmd/frontend/internal/app/resolvers/progress_test.go b/enterprise/cmd/frontend/internal/app/resolvers/progress_test.go index d76d514d742..0b79588fb7b 100644 --- a/enterprise/cmd/frontend/internal/app/resolvers/progress_test.go +++ b/enterprise/cmd/frontend/internal/app/resolvers/progress_test.go @@ -3,7 +3,7 @@ package resolvers import ( "testing" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/lib/pointers" ) diff --git a/enterprise/cmd/frontend/internal/context/BUILD.bazel b/enterprise/cmd/frontend/internal/context/BUILD.bazel index 71c4991173b..5300d012e86 100644 --- a/enterprise/cmd/frontend/internal/context/BUILD.bazel +++ b/enterprise/cmd/frontend/internal/context/BUILD.bazel @@ -10,10 +10,10 @@ go_library( "//enterprise/cmd/frontend/internal/context/resolvers", "//enterprise/internal/codycontext:context", "//enterprise/internal/database", - "//enterprise/internal/embeddings", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", + "//internal/embeddings", "//internal/observation", "//internal/search/client", ], diff --git a/enterprise/cmd/frontend/internal/context/init.go b/enterprise/cmd/frontend/internal/context/init.go index f5bdad47463..0be19e0987f 100644 --- a/enterprise/cmd/frontend/internal/context/init.go +++ b/enterprise/cmd/frontend/internal/context/init.go @@ -7,10 +7,10 @@ import ( "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/context/resolvers" codycontext "github.com/sourcegraph/sourcegraph/enterprise/internal/codycontext" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/observation" "github.com/sourcegraph/sourcegraph/internal/search/client" ) diff --git a/enterprise/cmd/frontend/internal/context/resolvers/BUILD.bazel b/enterprise/cmd/frontend/internal/context/resolvers/BUILD.bazel index a81c2366c72..1bde244fa7b 100644 --- a/enterprise/cmd/frontend/internal/context/resolvers/BUILD.bazel +++ b/enterprise/cmd/frontend/internal/context/resolvers/BUILD.bazel @@ -31,13 +31,13 @@ go_test( "//cmd/frontend/graphqlbackend", "//enterprise/internal/codycontext:context", "//enterprise/internal/database", - "//enterprise/internal/embeddings", "//internal/actor", "//internal/api", "//internal/authz", "//internal/conf", "//internal/database", "//internal/database/dbtest", + "//internal/embeddings", "//internal/featureflag", "//internal/gitserver", "//internal/observation", diff --git a/enterprise/cmd/frontend/internal/context/resolvers/context_test.go b/enterprise/cmd/frontend/internal/context/resolvers/context_test.go index 6253c07133e..d524e6674e1 100644 --- a/enterprise/cmd/frontend/internal/context/resolvers/context_test.go +++ b/enterprise/cmd/frontend/internal/context/resolvers/context_test.go @@ -13,13 +13,13 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" codycontext "github.com/sourcegraph/sourcegraph/enterprise/internal/codycontext" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" + "github.com/sourcegraph/sourcegraph/internal/embeddings" "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/observation" diff --git a/enterprise/cmd/frontend/internal/embeddings/BUILD.bazel b/enterprise/cmd/frontend/internal/embeddings/BUILD.bazel index c077ebbc9ae..76c88ef6514 100644 --- a/enterprise/cmd/frontend/internal/embeddings/BUILD.bazel +++ b/enterprise/cmd/frontend/internal/embeddings/BUILD.bazel @@ -8,11 +8,11 @@ go_library( deps = [ "//cmd/frontend/enterprise", "//enterprise/cmd/frontend/internal/embeddings/resolvers", - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/background/repo", "//internal/codeintel", "//internal/conf/conftypes", "//internal/database", + "//internal/embeddings", + "//internal/embeddings/background/repo", "//internal/gitserver", "//internal/observation", ], diff --git a/enterprise/cmd/frontend/internal/embeddings/init.go b/enterprise/cmd/frontend/internal/embeddings/init.go index cad27e1ad46..4aa382cfac4 100644 --- a/enterprise/cmd/frontend/internal/embeddings/init.go +++ b/enterprise/cmd/frontend/internal/embeddings/init.go @@ -5,11 +5,11 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise" "github.com/sourcegraph/sourcegraph/enterprise/cmd/frontend/internal/embeddings/resolvers" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/codeintel" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/observation" ) diff --git a/enterprise/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel b/enterprise/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel index 87a53257413..19aa8e6800c 100644 --- a/enterprise/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel +++ b/enterprise/cmd/frontend/internal/embeddings/resolvers/BUILD.bazel @@ -14,13 +14,13 @@ go_library( "//cmd/frontend/graphqlbackend", "//cmd/frontend/graphqlbackend/graphqlutil", "//enterprise/internal/cody", - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/background/repo", "//internal/api", "//internal/auth", "//internal/authz", "//internal/conf", "//internal/database", + "//internal/embeddings", + "//internal/embeddings/background/repo", "//internal/errcode", "//internal/gitserver", "//internal/gqlutil", @@ -38,14 +38,14 @@ go_test( embed = [":resolvers"], deps = [ "//cmd/frontend/graphqlbackend", - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/background/repo", "//enterprise/internal/licensing", "//internal/actor", "//internal/api", "//internal/authz", "//internal/conf", "//internal/database", + "//internal/embeddings", + "//internal/embeddings/background/repo", "//internal/featureflag", "//internal/gitserver", "//internal/types", diff --git a/enterprise/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go b/enterprise/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go index ff0e34b9023..2eea5d215c7 100644 --- a/enterprise/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go +++ b/enterprise/cmd/frontend/internal/embeddings/resolvers/repo_embedding_jobs.go @@ -11,9 +11,9 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" - repobg "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" + repobg "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/errcode" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/gqlutil" diff --git a/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers.go b/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers.go index ae30e4529c7..0f4df97a993 100644 --- a/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers.go +++ b/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers.go @@ -15,13 +15,13 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil" "github.com/sourcegraph/sourcegraph/enterprise/internal/cody" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - repobg "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + repobg "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/gitserver" ) diff --git a/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers_test.go b/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers_test.go index 397c3ff7134..f5c1b9f5559 100644 --- a/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers_test.go +++ b/enterprise/cmd/frontend/internal/embeddings/resolvers/resolvers_test.go @@ -10,14 +10,14 @@ import ( "github.com/stretchr/testify/require" "github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/enterprise/internal/licensing" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/types" diff --git a/enterprise/cmd/worker/internal/embeddings/repo/BUILD.bazel b/enterprise/cmd/worker/internal/embeddings/repo/BUILD.bazel index 42330b05bce..57700aeb13d 100644 --- a/enterprise/cmd/worker/internal/embeddings/repo/BUILD.bazel +++ b/enterprise/cmd/worker/internal/embeddings/repo/BUILD.bazel @@ -18,9 +18,6 @@ go_library( "//cmd/worker/shared/init/db", "//enterprise/cmd/worker/shared/init/codeintel", "//enterprise/internal/database", - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/background/repo", - "//enterprise/internal/embeddings/embed", "//internal/actor", "//internal/api", "//internal/api/internalapi", @@ -29,6 +26,9 @@ go_library( "//internal/conf", "//internal/conf/conftypes", "//internal/database", + "//internal/embeddings", + "//internal/embeddings/background/repo", + "//internal/embeddings/embed", "//internal/env", "//internal/featureflag", "//internal/gitserver", @@ -51,10 +51,10 @@ go_test( srcs = ["handler_test.go"], embed = [":repo"], deps = [ - "//enterprise/internal/embeddings/embed", "//internal/api", "//internal/authz", "//internal/conf/conftypes", + "//internal/embeddings/embed", "//internal/gitserver", "@com_github_google_go_cmp//cmp", ], diff --git a/enterprise/cmd/worker/internal/embeddings/repo/handler.go b/enterprise/cmd/worker/internal/embeddings/repo/handler.go index 725357d21cd..2808aa62370 100644 --- a/enterprise/cmd/worker/internal/embeddings/repo/handler.go +++ b/enterprise/cmd/worker/internal/embeddings/repo/handler.go @@ -7,14 +7,14 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/searcher/diff" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - bgrepo "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/api" codeintelContext "github.com/sourcegraph/sourcegraph/internal/codeintel/context" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + bgrepo "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/featureflag" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/paths" diff --git a/enterprise/cmd/worker/internal/embeddings/repo/handler_test.go b/enterprise/cmd/worker/internal/embeddings/repo/handler_test.go index 20755a69567..a0d808bcd9d 100644 --- a/enterprise/cmd/worker/internal/embeddings/repo/handler_test.go +++ b/enterprise/cmd/worker/internal/embeddings/repo/handler_test.go @@ -10,10 +10,10 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/authz" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/gitserver" ) diff --git a/enterprise/cmd/worker/internal/embeddings/repo/janitor.go b/enterprise/cmd/worker/internal/embeddings/repo/janitor.go index 09426858dd4..95ddee37aac 100644 --- a/enterprise/cmd/worker/internal/embeddings/repo/janitor.go +++ b/enterprise/cmd/worker/internal/embeddings/repo/janitor.go @@ -6,7 +6,7 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/worker/job" workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db" - repoembeddingsbg "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" + repoembeddingsbg "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/goroutine" "github.com/sourcegraph/sourcegraph/internal/observation" diff --git a/enterprise/cmd/worker/internal/embeddings/repo/scheduler.go b/enterprise/cmd/worker/internal/embeddings/repo/scheduler.go index 09e6839ac40..8e700d190f7 100644 --- a/enterprise/cmd/worker/internal/embeddings/repo/scheduler.go +++ b/enterprise/cmd/worker/internal/embeddings/repo/scheduler.go @@ -6,10 +6,10 @@ import ( "github.com/sourcegraph/sourcegraph/cmd/worker/job" workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/goroutine" diff --git a/enterprise/cmd/worker/internal/embeddings/repo/worker.go b/enterprise/cmd/worker/internal/embeddings/repo/worker.go index c4610b3df35..fe04c3dee5c 100644 --- a/enterprise/cmd/worker/internal/embeddings/repo/worker.go +++ b/enterprise/cmd/worker/internal/embeddings/repo/worker.go @@ -8,10 +8,10 @@ import ( workerdb "github.com/sourcegraph/sourcegraph/cmd/worker/shared/init/db" "github.com/sourcegraph/sourcegraph/enterprise/cmd/worker/shared/init/codeintel" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - repoembeddingsbg "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/actor" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + repoembeddingsbg "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/env" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/goroutine" diff --git a/enterprise/internal/codycontext/BUILD.bazel b/enterprise/internal/codycontext/BUILD.bazel index 780eebf6c4c..8336fd14e4b 100644 --- a/enterprise/internal/codycontext/BUILD.bazel +++ b/enterprise/internal/codycontext/BUILD.bazel @@ -7,9 +7,9 @@ go_library( visibility = ["//enterprise:__subpackages__"], deps = [ "//enterprise/internal/database", - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/embed", "//internal/api", + "//internal/embeddings", + "//internal/embeddings/embed", "//internal/metrics", "//internal/observation", "//internal/search", diff --git a/enterprise/internal/codycontext/context.go b/enterprise/internal/codycontext/context.go index c1635545a45..e0993c47ee0 100644 --- a/enterprise/internal/codycontext/context.go +++ b/enterprise/internal/codycontext/context.go @@ -14,9 +14,9 @@ import ( "go.opentelemetry.io/otel/attribute" edb "github.com/sourcegraph/sourcegraph/enterprise/internal/database" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/api" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed" "github.com/sourcegraph/sourcegraph/internal/metrics" "github.com/sourcegraph/sourcegraph/internal/observation" "github.com/sourcegraph/sourcegraph/internal/search" diff --git a/enterprise/internal/embeddings/embed/client/BUILD.bazel b/enterprise/internal/embeddings/embed/client/BUILD.bazel deleted file mode 100644 index 2b04f990ce6..00000000000 --- a/enterprise/internal/embeddings/embed/client/BUILD.bazel +++ /dev/null @@ -1,8 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "client", - srcs = ["client.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed/client", - visibility = ["//enterprise:__subpackages__"], -) diff --git a/internal/database/external_services_test.go b/internal/database/external_services_test.go index 8b20d8f4ef6..924a7b09005 100644 --- a/internal/database/external_services_test.go +++ b/internal/database/external_services_test.go @@ -142,8 +142,8 @@ func TestExternalServicesStore_ValidateConfig(t *testing.T) { wantErr: "", }, { - name: "1 error - Bitbucket.org", - kind: extsvc.KindBitbucketCloud, + name: "1 error - Bitbucket.org", + kind: extsvc.KindBitbucketCloud, // Invalid UUID, using + instead of - config: `{"url": "https://bitbucket.org", "username": "ceo", "appPassword": "abc", "exclude": [{"uuid":"{fceb73c7+cef6-4abe-956d-e471281126bd}"}]}`, wantErr: `exclude.0.uuid: Does not match pattern '^\{[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\}$'`, diff --git a/enterprise/internal/embeddings/BUILD.bazel b/internal/embeddings/BUILD.bazel similarity index 89% rename from enterprise/internal/embeddings/BUILD.bazel rename to internal/embeddings/BUILD.bazel index bff0454b4b2..9aecb4a25e3 100644 --- a/enterprise/internal/embeddings/BUILD.bazel +++ b/internal/embeddings/BUILD.bazel @@ -20,15 +20,15 @@ go_library( "types.go", "uploadstore.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings", - visibility = ["//enterprise:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/internal/embeddings", + visibility = ["//:__subpackages__"], deps = [ - "//enterprise/internal/embeddings/background/repo", "//internal/api", "//internal/codeintel/types", "//internal/conf/conftypes", "//internal/conf/deploy", "//internal/database", + "//internal/embeddings/background/repo", "//internal/endpoint", "//internal/env", "//internal/gitserver", @@ -70,11 +70,11 @@ go_test( "requires-network", ], deps = [ - "//enterprise/internal/embeddings/background/repo", "//internal/api", "//internal/codeintel/types", "//internal/database", "//internal/database/dbtest", + "//internal/embeddings/background/repo", "//internal/gitserver", "//internal/types", "//internal/uploadstore", diff --git a/enterprise/internal/embeddings/background/repo/BUILD.bazel b/internal/embeddings/background/repo/BUILD.bazel similarity index 92% rename from enterprise/internal/embeddings/background/repo/BUILD.bazel rename to internal/embeddings/background/repo/BUILD.bazel index aae97e31fae..b80645b69f9 100644 --- a/enterprise/internal/embeddings/background/repo/BUILD.bazel +++ b/internal/embeddings/background/repo/BUILD.bazel @@ -8,7 +8,7 @@ go_library( "store.go", "types.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo", + importpath = "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo", visibility = ["//:__subpackages__"], deps = [ "//internal/api", diff --git a/enterprise/internal/embeddings/background/repo/mocks_temp.go b/internal/embeddings/background/repo/mocks_temp.go similarity index 99% rename from enterprise/internal/embeddings/background/repo/mocks_temp.go rename to internal/embeddings/background/repo/mocks_temp.go index a31448fb33e..779a6a400a3 100644 --- a/enterprise/internal/embeddings/background/repo/mocks_temp.go +++ b/internal/embeddings/background/repo/mocks_temp.go @@ -17,7 +17,7 @@ import ( // MockRepoEmbeddingJobsStore is a mock implementation of the // RepoEmbeddingJobsStore interface (from the package -// github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo) +// github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo) // used for unit testing. type MockRepoEmbeddingJobsStore struct { // CancelRepoEmbeddingJobFunc is an instance of a mock function object diff --git a/enterprise/internal/embeddings/background/repo/store.go b/internal/embeddings/background/repo/store.go similarity index 100% rename from enterprise/internal/embeddings/background/repo/store.go rename to internal/embeddings/background/repo/store.go diff --git a/enterprise/internal/embeddings/background/repo/store_test.go b/internal/embeddings/background/repo/store_test.go similarity index 100% rename from enterprise/internal/embeddings/background/repo/store_test.go rename to internal/embeddings/background/repo/store_test.go diff --git a/enterprise/internal/embeddings/background/repo/types.go b/internal/embeddings/background/repo/types.go similarity index 100% rename from enterprise/internal/embeddings/background/repo/types.go rename to internal/embeddings/background/repo/types.go diff --git a/enterprise/internal/embeddings/client.go b/internal/embeddings/client.go similarity index 100% rename from enterprise/internal/embeddings/client.go rename to internal/embeddings/client.go diff --git a/enterprise/internal/embeddings/dot.go b/internal/embeddings/dot.go similarity index 100% rename from enterprise/internal/embeddings/dot.go rename to internal/embeddings/dot.go diff --git a/enterprise/internal/embeddings/dot_amd64.go b/internal/embeddings/dot_amd64.go similarity index 100% rename from enterprise/internal/embeddings/dot_amd64.go rename to internal/embeddings/dot_amd64.go diff --git a/enterprise/internal/embeddings/dot_amd64.s b/internal/embeddings/dot_amd64.s similarity index 100% rename from enterprise/internal/embeddings/dot_amd64.s rename to internal/embeddings/dot_amd64.s diff --git a/enterprise/internal/embeddings/dot_arm64.go b/internal/embeddings/dot_arm64.go similarity index 100% rename from enterprise/internal/embeddings/dot_arm64.go rename to internal/embeddings/dot_arm64.go diff --git a/enterprise/internal/embeddings/dot_arm64.s b/internal/embeddings/dot_arm64.s similarity index 100% rename from enterprise/internal/embeddings/dot_arm64.s rename to internal/embeddings/dot_arm64.s diff --git a/enterprise/internal/embeddings/dot_portable.go b/internal/embeddings/dot_portable.go similarity index 100% rename from enterprise/internal/embeddings/dot_portable.go rename to internal/embeddings/dot_portable.go diff --git a/enterprise/internal/embeddings/dot_test.go b/internal/embeddings/dot_test.go similarity index 100% rename from enterprise/internal/embeddings/dot_test.go rename to internal/embeddings/dot_test.go diff --git a/enterprise/internal/embeddings/embed/BUILD.bazel b/internal/embeddings/embed/BUILD.bazel similarity index 62% rename from enterprise/internal/embeddings/embed/BUILD.bazel rename to internal/embeddings/embed/BUILD.bazel index c65e3ae0808..924b0babc45 100644 --- a/enterprise/internal/embeddings/embed/BUILD.bazel +++ b/internal/embeddings/embed/BUILD.bazel @@ -8,19 +8,19 @@ go_library( "files.go", "iface.go", ], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed", - visibility = ["//enterprise:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/internal/embeddings/embed", + visibility = ["//:__subpackages__"], deps = [ - "//enterprise/internal/embeddings", - "//enterprise/internal/embeddings/background/repo", - "//enterprise/internal/embeddings/embed/client", - "//enterprise/internal/embeddings/embed/client/openai", - "//enterprise/internal/embeddings/embed/client/sourcegraph", "//internal/api", "//internal/binary", "//internal/codeintel/context", "//internal/codeintel/types", "//internal/conf/conftypes", + "//internal/embeddings", + "//internal/embeddings/background/repo", + "//internal/embeddings/embed/client", + "//internal/embeddings/embed/client/openai", + "//internal/embeddings/embed/client/sourcegraph", "//internal/httpcli", "//internal/paths", "//lib/errors", @@ -38,11 +38,11 @@ go_test( ], embed = [":embed"], deps = [ - "//enterprise/internal/embeddings/background/repo", - "//enterprise/internal/embeddings/embed/client", "//internal/api", "//internal/codeintel/context", "//internal/codeintel/types", + "//internal/embeddings/background/repo", + "//internal/embeddings/embed/client", "//lib/errors", "@com_github_sourcegraph_log//:log", "@com_github_stretchr_testify//require", diff --git a/internal/embeddings/embed/client/BUILD.bazel b/internal/embeddings/embed/client/BUILD.bazel new file mode 100644 index 00000000000..31f564a942c --- /dev/null +++ b/internal/embeddings/embed/client/BUILD.bazel @@ -0,0 +1,8 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "client", + srcs = ["client.go"], + importpath = "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client", + visibility = ["//:__subpackages__"], +) diff --git a/enterprise/internal/embeddings/embed/client/client.go b/internal/embeddings/embed/client/client.go similarity index 100% rename from enterprise/internal/embeddings/embed/client/client.go rename to internal/embeddings/embed/client/client.go diff --git a/enterprise/internal/embeddings/embed/client/openai/BUILD.bazel b/internal/embeddings/embed/client/openai/BUILD.bazel similarity index 73% rename from enterprise/internal/embeddings/embed/client/openai/BUILD.bazel rename to internal/embeddings/embed/client/openai/BUILD.bazel index 8ec92f67794..2f83c09674d 100644 --- a/enterprise/internal/embeddings/embed/client/openai/BUILD.bazel +++ b/internal/embeddings/embed/client/openai/BUILD.bazel @@ -4,8 +4,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "openai", srcs = ["client.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed/client/openai", - visibility = ["//enterprise:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client/openai", + visibility = ["//:__subpackages__"], deps = [ "//internal/conf/conftypes", "//lib/errors", diff --git a/enterprise/internal/embeddings/embed/client/openai/client.go b/internal/embeddings/embed/client/openai/client.go similarity index 100% rename from enterprise/internal/embeddings/embed/client/openai/client.go rename to internal/embeddings/embed/client/openai/client.go diff --git a/enterprise/internal/embeddings/embed/client/openai/client_test.go b/internal/embeddings/embed/client/openai/client_test.go similarity index 100% rename from enterprise/internal/embeddings/embed/client/openai/client_test.go rename to internal/embeddings/embed/client/openai/client_test.go diff --git a/enterprise/internal/embeddings/embed/client/sourcegraph/BUILD.bazel b/internal/embeddings/embed/client/sourcegraph/BUILD.bazel similarity index 54% rename from enterprise/internal/embeddings/embed/client/sourcegraph/BUILD.bazel rename to internal/embeddings/embed/client/sourcegraph/BUILD.bazel index 546365be068..8af4b86664d 100644 --- a/enterprise/internal/embeddings/embed/client/sourcegraph/BUILD.bazel +++ b/internal/embeddings/embed/client/sourcegraph/BUILD.bazel @@ -3,12 +3,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "sourcegraph", srcs = ["client.go"], - importpath = "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed/client/sourcegraph", - visibility = ["//enterprise:__subpackages__"], + importpath = "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client/sourcegraph", + visibility = ["//:__subpackages__"], deps = [ - "//enterprise/internal/embeddings/embed/client", "//internal/codygateway", "//internal/conf/conftypes", + "//internal/embeddings/embed/client", "//internal/httpcli", "//lib/errors", ], diff --git a/enterprise/internal/embeddings/embed/client/sourcegraph/client.go b/internal/embeddings/embed/client/sourcegraph/client.go similarity index 98% rename from enterprise/internal/embeddings/embed/client/sourcegraph/client.go rename to internal/embeddings/embed/client/sourcegraph/client.go index 912500b19c9..bfe57d41e9d 100644 --- a/enterprise/internal/embeddings/embed/client/sourcegraph/client.go +++ b/internal/embeddings/embed/client/sourcegraph/client.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed/client" "github.com/sourcegraph/sourcegraph/internal/codygateway" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client" "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/lib/errors" ) diff --git a/enterprise/internal/embeddings/embed/embed.go b/internal/embeddings/embed/embed.go similarity index 95% rename from enterprise/internal/embeddings/embed/embed.go rename to internal/embeddings/embed/embed.go index 97fce26411e..d5d0e48965c 100644 --- a/enterprise/internal/embeddings/embed/embed.go +++ b/internal/embeddings/embed/embed.go @@ -5,15 +5,15 @@ import ( "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings" - bgrepo "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed/client" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed/client/openai" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed/client/sourcegraph" "github.com/sourcegraph/sourcegraph/internal/api" codeintelContext "github.com/sourcegraph/sourcegraph/internal/codeintel/context" "github.com/sourcegraph/sourcegraph/internal/codeintel/types" "github.com/sourcegraph/sourcegraph/internal/conf/conftypes" + "github.com/sourcegraph/sourcegraph/internal/embeddings" + bgrepo "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client/openai" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client/sourcegraph" "github.com/sourcegraph/sourcegraph/internal/httpcli" "github.com/sourcegraph/sourcegraph/internal/paths" "github.com/sourcegraph/sourcegraph/lib/errors" diff --git a/enterprise/internal/embeddings/embed/embed_test.go b/internal/embeddings/embed/embed_test.go similarity index 98% rename from enterprise/internal/embeddings/embed/embed_test.go rename to internal/embeddings/embed/embed_test.go index f87e0210e28..2da0fdfc5d5 100644 --- a/enterprise/internal/embeddings/embed/embed_test.go +++ b/internal/embeddings/embed/embed_test.go @@ -8,11 +8,11 @@ import ( "github.com/sourcegraph/log" "github.com/stretchr/testify/require" - bgrepo "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed/client" "github.com/sourcegraph/sourcegraph/internal/api" codeintelContext "github.com/sourcegraph/sourcegraph/internal/codeintel/context" "github.com/sourcegraph/sourcegraph/internal/codeintel/types" + bgrepo "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" + "github.com/sourcegraph/sourcegraph/internal/embeddings/embed/client" "github.com/sourcegraph/sourcegraph/lib/errors" ) diff --git a/enterprise/internal/embeddings/embed/files.go b/internal/embeddings/embed/files.go similarity index 100% rename from enterprise/internal/embeddings/embed/files.go rename to internal/embeddings/embed/files.go diff --git a/enterprise/internal/embeddings/embed/files_test.go b/internal/embeddings/embed/files_test.go similarity index 100% rename from enterprise/internal/embeddings/embed/files_test.go rename to internal/embeddings/embed/files_test.go diff --git a/enterprise/internal/embeddings/embed/iface.go b/internal/embeddings/embed/iface.go similarity index 100% rename from enterprise/internal/embeddings/embed/iface.go rename to internal/embeddings/embed/iface.go diff --git a/enterprise/internal/embeddings/embed/mocks_test.go b/internal/embeddings/embed/mocks_test.go similarity index 98% rename from enterprise/internal/embeddings/embed/mocks_test.go rename to internal/embeddings/embed/mocks_test.go index 8fde7e8b0d5..5b6723d9462 100644 --- a/enterprise/internal/embeddings/embed/mocks_test.go +++ b/internal/embeddings/embed/mocks_test.go @@ -15,8 +15,8 @@ import ( // MockContextService is a mock implementation of the ContextService // interface (from the package -// github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed) -// used for unit testing. +// github.com/sourcegraph/sourcegraph/internal/embeddings/embed) used for +// unit testing. type MockContextService struct { // SplitIntoEmbeddableChunksFunc is an instance of a mock function // object controlling the behavior of the method diff --git a/enterprise/internal/embeddings/index_name.go b/internal/embeddings/index_name.go similarity index 100% rename from enterprise/internal/embeddings/index_name.go rename to internal/embeddings/index_name.go diff --git a/enterprise/internal/embeddings/index_storage.go b/internal/embeddings/index_storage.go similarity index 100% rename from enterprise/internal/embeddings/index_storage.go rename to internal/embeddings/index_storage.go diff --git a/enterprise/internal/embeddings/index_storage_test.go b/internal/embeddings/index_storage_test.go similarity index 100% rename from enterprise/internal/embeddings/index_storage_test.go rename to internal/embeddings/index_storage_test.go diff --git a/enterprise/internal/embeddings/mocks_temp.go b/internal/embeddings/mocks_temp.go similarity index 99% rename from enterprise/internal/embeddings/mocks_temp.go rename to internal/embeddings/mocks_temp.go index deed5b54fe3..36ffa3d0c93 100644 --- a/enterprise/internal/embeddings/mocks_temp.go +++ b/internal/embeddings/mocks_temp.go @@ -12,9 +12,8 @@ import ( ) // MockClient is a mock implementation of the Client interface (from the -// package -// github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings) used -// for unit testing. +// package github.com/sourcegraph/sourcegraph/internal/embeddings) used for +// unit testing. type MockClient struct { // IsContextRequiredForChatQueryFunc is an instance of a mock function // object controlling the behavior of the method diff --git a/enterprise/internal/embeddings/quantize.go b/internal/embeddings/quantize.go similarity index 100% rename from enterprise/internal/embeddings/quantize.go rename to internal/embeddings/quantize.go diff --git a/enterprise/internal/embeddings/schedule.go b/internal/embeddings/schedule.go similarity index 95% rename from enterprise/internal/embeddings/schedule.go rename to internal/embeddings/schedule.go index d32c92bcbbe..e628b361545 100644 --- a/enterprise/internal/embeddings/schedule.go +++ b/internal/embeddings/schedule.go @@ -3,9 +3,9 @@ package embeddings import ( "context" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/lib/errors" ) diff --git a/enterprise/internal/embeddings/schedule_test.go b/internal/embeddings/schedule_test.go similarity index 95% rename from enterprise/internal/embeddings/schedule_test.go rename to internal/embeddings/schedule_test.go index ab67e75828d..d6ef70e6c64 100644 --- a/enterprise/internal/embeddings/schedule_test.go +++ b/internal/embeddings/schedule_test.go @@ -7,10 +7,10 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/stretchr/testify/require" - "github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/api" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbtest" + "github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo" "github.com/sourcegraph/sourcegraph/internal/gitserver" "github.com/sourcegraph/sourcegraph/internal/types" ) diff --git a/enterprise/internal/embeddings/similarity_search.go b/internal/embeddings/similarity_search.go similarity index 100% rename from enterprise/internal/embeddings/similarity_search.go rename to internal/embeddings/similarity_search.go diff --git a/enterprise/internal/embeddings/similarity_search_test.go b/internal/embeddings/similarity_search_test.go similarity index 100% rename from enterprise/internal/embeddings/similarity_search_test.go rename to internal/embeddings/similarity_search_test.go diff --git a/enterprise/internal/embeddings/testdata/generate_similarity_search_test_data.py b/internal/embeddings/testdata/generate_similarity_search_test_data.py similarity index 100% rename from enterprise/internal/embeddings/testdata/generate_similarity_search_test_data.py rename to internal/embeddings/testdata/generate_similarity_search_test_data.py diff --git a/enterprise/internal/embeddings/types.go b/internal/embeddings/types.go similarity index 100% rename from enterprise/internal/embeddings/types.go rename to internal/embeddings/types.go diff --git a/enterprise/internal/embeddings/types_test.go b/internal/embeddings/types_test.go similarity index 100% rename from enterprise/internal/embeddings/types_test.go rename to internal/embeddings/types_test.go diff --git a/enterprise/internal/embeddings/uploadstore.go b/internal/embeddings/uploadstore.go similarity index 100% rename from enterprise/internal/embeddings/uploadstore.go rename to internal/embeddings/uploadstore.go diff --git a/mockgen.temp.yaml b/mockgen.temp.yaml index d58808891ee..c70014e8e38 100644 --- a/mockgen.temp.yaml +++ b/mockgen.temp.yaml @@ -129,11 +129,11 @@ path: github.com/sourcegraph/sourcegraph/enterprise/internal/github_apps/store interfaces: - GitHubAppsStore -- filename: enterprise/internal/embeddings/mocks_temp.go - path: github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings +- filename: internal/embeddings/mocks_temp.go + path: github.com/sourcegraph/sourcegraph/internal/embeddings interfaces: - Client -- filename: enterprise/internal/embeddings/background/repo/mocks_temp.go - path: github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/background/repo +- filename: internal/embeddings/background/repo/mocks_temp.go + path: github.com/sourcegraph/sourcegraph/internal/embeddings/background/repo interfaces: - RepoEmbeddingJobsStore diff --git a/mockgen.test.yaml b/mockgen.test.yaml index 21939805fe0..83edda6ed34 100644 --- a/mockgen.test.yaml +++ b/mockgen.test.yaml @@ -388,8 +388,8 @@ - path: github.com/Khan/genqlient/graphql interfaces: - Client -- filename: enterprise/internal/embeddings/embed/mocks_test.go - path: github.com/sourcegraph/sourcegraph/enterprise/internal/embeddings/embed +- filename: internal/embeddings/embed/mocks_test.go + path: github.com/sourcegraph/sourcegraph/internal/embeddings/embed interfaces: - ContextService - filename: internal/redispool/mocks.go diff --git a/sg.config.yaml b/sg.config.yaml index d9d8afce0e2..02d384898e9 100644 --- a/sg.config.yaml +++ b/sg.config.yaml @@ -271,7 +271,7 @@ commands: - lib - internal - enterprise/cmd/embeddings - - enterprise/internal/embeddings + - internal/embeddings worker: cmd: | export SOURCEGRAPH_LICENSE_GENERATION_KEY=$(cat ../dev-private/enterprise/dev/test-license-generation-key.pem)