Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Group search submodules into a single top-level module folder (#83016)

Chris Truter701ac97e88cc
diff --git a/.claude/agents/ai-backend-expert.md b/.claude/agents/ai-backend-expert.md
index d36def920df..4e2b3c9fedd 100644
--- a/.claude/agents/ai-backend-expert.md
+++ b/.claude/agents/ai-backend-expert.md
@@ -28,14 +28,14 @@ OSS (`src/metabase/`):
- `slackbot/` - Metabot in Slack, `/api/metabot/slack`. `metabase.slackbot.db`.
- `ai_tracing/` - eval-time span capture (`metabase.ai-tracing.core`, `/api/eval-trace`). Separate from production tracing.
- `agent_lib/` - `metabase.agent-lib.representations`, the portable MBQL 5 form that agents read and write.
-- `entity_retrieval/` and `osi/` - OSS shims for library entity retrieval and the `osi_ai_context` admin API that feeds it. Each has a `db` namespace.
+- `search/entity_retrieval/` and `osi/` - OSS shims for library entity retrieval and the `osi_ai_context` admin API that feeds it. Each has a `db` namespace.
- `sql_tools/` - SQL parsing (SQLGlot or Macaw) used by `metabase.llm.context` and the SQL tools. Consume it through `metabase.sql-tools.core`.
Enterprise (`enterprise/backend/src/metabase_enterprise/`):
- `metabot/` - `metabase-enterprise.metabot.permissions` (per-group permission resolution), `.provider` (managed AI add-on), group and instance limit models, `ai_usage_trimmer` task, `.db`.
- `metabot_analytics/` - `/api/ee/metabot-analytics` (needs `:audit-app`), `.db`.
- `mcp/`, `agent_api/` - EE usage logging (`mcp_tool_call_log`, `agent_api_call_log`), `.db` each.
-- `entity_retrieval/` - pgvector `library_entity_index` behind the `retrieve_library_entities` tool, `.db`.
+- `search/entity_retrieval/` - pgvector `library_entity_index` behind the `retrieve_library_entities` tool, `.db`.
## Invariants and landmines
diff --git a/.claude/agents/search-backend-expert.md b/.claude/agents/search-backend-expert.md
index 3c570d16160..a2f15cf7eed 100644
--- a/.claude/agents/search-backend-expert.md
+++ b/.claude/agents/search-backend-expert.md
@@ -34,13 +34,13 @@ OSS search (`src/metabase/search/`):
Enterprise:
- `metabase-enterprise.search.scoring` - adds `:official-collection` and `:verified` scorers when those features are on.
-- `metabase-enterprise.semantic-search.*`:
+- `metabase-enterprise.search.semantic.*`:
- `core` - engine impl and fallback; `pgvector-api` - query and upsert; `index`, `index-metadata` - vector tables.
- `gate` - decouples ingestion from embedding; `indexer` polls it; `dlq` isolates and retries failing docs; `repair` finds lost deletes.
- `embedding` - embedding provider calls; `embedders` - name -> vector lookup over the index; `scoring`, `appdb-scoring` - blended ranking.
- `db.datasource`, `db.migration` - the pgvector store; `models.token-tracking` - usage metering.
- `task.*` - indexer, index-repair, index-cleanup, usage-trimmer, metric-collector. `db` - app-DB queries.
-- `metabase.entity-retrieval.*` / `metabase-enterprise.entity-retrieval.*` - a separate pgvector index of library entities that Metabot uses. It reuses the semantic-search datasource and embedding health checks. It is a neighbour, not part of search.
+- `metabase.search.entity-retrieval.*` / `metabase-enterprise.search.entity-retrieval.*` - a separate pgvector index of library entities that Metabot uses. It reuses the semantic-search datasource and embedding health checks. It is a neighbour, not part of search.
X-rays (`src/metabase/xrays/`): `metabase.xrays.automagic-dashboards.{core,interesting,dashboard-templates,populate,comparison,combination,filters,names}`, `metabase.xrays.related`, `metabase.xrays.domain-entities.*`, `metabase.xrays.transforms.*`, `metabase.xrays.api.automagic-dashboards`, `metabase.xrays.db`. Templates are YAML in `resources/automagic_dashboards/{table,field,metric,question,comparison}`.
@@ -66,8 +66,8 @@ Activity and views: `metabase.activity-feed.{api,models.recent-views,events.rece
1. Name the engine and the app DB type first. Use `/api/search/debug` or `metabase.search.debug` to see which stage drops an entity (`:not-searchable`, `:missing-from-index`, `:filtered`, `:not-permitted`, `:ranked-out`).
2. For ranking, read the per-scorer `:scores` in results and compare them with `metabase.search.config/weights`. Recheck exact-name matches after any weight change.
3. For missing or stale results, check the spec `:where` (`search.ingestion/indexable-row?`), then the queue, then the active index table.
-4. Test helpers: `metabase.search.test-util` (`with-temp-index-table`, `with-sync-search-indexing`, `with-appdb-search-and-legacy-search`, `with-legacy-search`). Semantic: `metabase-enterprise.semantic-search.test-util` (`with-test-db!`, `with-mock-embeddings`). Semantic tests need a pgvector Postgres (see `semantic_search/docker-compose.yml`).
-5. Test locations: `test/metabase/search/` (`api_test`, `spec_test`, `ingestion_test`, `appdb/`, `in_place/`), `enterprise/backend/test/metabase_enterprise/semantic_search/`, `test/metabase/xrays/`, `test/metabase/indexed_entities/`, `test/metabase/activity_feed/`.
+4. Test helpers: `metabase.search.test-util` (`with-temp-index-table`, `with-sync-search-indexing`, `with-appdb-search-and-legacy-search`, `with-legacy-search`). Semantic: `metabase-enterprise.search.semantic.test-util` (`with-test-db!`, `with-mock-embeddings`). Semantic tests need a pgvector Postgres (see `search/semantic/docker-compose.yml`).
+5. Test locations: `test/metabase/search/` (`api_test`, `spec_test`, `ingestion_test`, `appdb/`, `in_place/`), `enterprise/backend/test/metabase_enterprise/search/semantic/`, `test/metabase/xrays/`, `test/metabase/indexed_entities/`, `test/metabase/activity_feed/`.
6. Run appdb tests on both H2 and Postgres when you change SQL in `appdb.specialization` or `appdb.query`.
## Return
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
index 0e4f44fe3be..4582a96546e 100644
--- a/.clj-kondo/config.edn
+++ b/.clj-kondo/config.edn
@@ -318,9 +318,9 @@
metabase.query-processor.util/normalize-token {:namespaces ["metabase.*"]}}}
:discouraged-var
- {metabase-enterprise.entity-retrieval.core/search-unfiltered {:message "Permission bypass risk: library-index hits are unfiltered — resolve each entity and drop what the current user can't read"}
- metabase.entity-retrieval.core/search-unfiltered {:message "Permission bypass risk: library-index hits are unfiltered — resolve each entity and drop what the current user can't read"}
- metabase.entity-retrieval.mirror/search-unfiltered {:message "Permission bypass risk: library-index hits are unfiltered — resolve each entity and drop what the current user can't read"}
+ {metabase-enterprise.search.entity-retrieval.core/search-unfiltered {:message "Permission bypass risk: library-index hits are unfiltered — resolve each entity and drop what the current user can't read"}
+ metabase.search.entity-retrieval.core/search-unfiltered {:message "Permission bypass risk: library-index hits are unfiltered — resolve each entity and drop what the current user can't read"}
+ metabase.search.entity-retrieval.mirror/search-unfiltered {:message "Permission bypass risk: library-index hits are unfiltered — resolve each entity and drop what the current user can't read"}
metabase-enterprise.transform-testing.expectations.equals/->EqualsRows {:message "Build an expectation with metabase-enterprise.transform-testing.expectations.protocol/build, over a value the schema has passed — the generated constructors skip validation"}
metabase-enterprise.transform-testing.expectations.equals/map->EqualsRows {:message "Build an expectation with metabase-enterprise.transform-testing.expectations.protocol/build, over a value the schema has passed — the generated constructors skip validation"}
metabase-enterprise.transform-testing.expectations.equals/->EqualsSql {:message "Build an expectation with metabase-enterprise.transform-testing.expectations.protocol/build, over a value the schema has passed — the generated constructors skip validation"}
@@ -483,10 +483,10 @@
instaparse.core/defparser clojure.core/def
metabase-enterprise.action-v2.test-util/with-test-tables! clojure.core/let
metabase-enterprise.content-translation.routes-test/with-new-secret-key! clojure.core/fn
- metabase-enterprise.entity-retrieval.reconcile-test/with-isolated-index clojure.core/fn
metabase-enterprise.mfa.enrollment-flow-test/with-fresh-user-session! clojure.core/fn
metabase-enterprise.mfa.login-flow-test/with-enrolled-rasta! clojure.core/fn
metabase-enterprise.mfa.recovery-codes-test/with-confirmed-enrollment! clojure.core/fn
+ metabase-enterprise.search.entity-retrieval.reconcile-test/with-isolated-index clojure.core/fn
metabase-enterprise.serialization.metadata-file-import.wire-format-test/with-tiny-fixture! clojure.core/fn
metabase-enterprise.serialization.test-util/with-dbs clojure.core/fn
metabase-enterprise.serialization.test-util/with-random-dump-dir clojure.core/let
@@ -626,7 +626,7 @@
metabase-enterprise.dependencies.api-test/with-dependents-test! hooks.common/with-two-bindings
metabase-enterprise.metabot-v3.tools.dependencies-test/with-dependent-transforms! hooks.common/with-two-bindings
metabase-enterprise.remote-sync.metric-dimension-api-test/with-synced-metric hooks.common/with-one-binding
- metabase-enterprise.semantic-search.db.connection/with-migrate-tx hooks.common/let-one-with-optional-value
+ metabase-enterprise.search.semantic.db.connection/with-migrate-tx hooks.common/let-one-with-optional-value
metabase-enterprise.serialization.api-test/with-serialization-test-data! hooks.common/with-three-bindings
metabase-enterprise.serialization.test-util/with-temp-dpc hooks.toucan2.tools.with-temp/with-temp
metabase-enterprise.transforms-python.drivers-test/with-test-table hooks.common/with-two-bindings
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index d6a632210f5..5fda7652b00 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -2532,14 +2532,12 @@
search.embeddings
{:team "Metabot"
- :ns-prefix "metabase.embeddings"
- :api #{metabase.embeddings.provider metabase.embeddings.startup}
+ :api #{metabase.search.embeddings.provider metabase.search.embeddings.startup}
:uses #{plugins util}}
search.entity-retrieval
{:team "Metabot"
- :ns-prefix "metabase.entity-retrieval"
- :api #{metabase.entity-retrieval.core metabase.entity-retrieval.mirror}
+ :api #{metabase.search.entity-retrieval.core metabase.search.entity-retrieval.mirror}
:uses #{premium-features util}
:model-imports #{:model/OsiAiContext}}
@@ -4299,8 +4297,7 @@
enterprise/search.embeddings
{:team "Metabot"
- :ns-prefix "metabase-enterprise.embeddings"
- :api #{metabase-enterprise.embeddings.client}
+ :api #{metabase-enterprise.search.embeddings.client}
:uses #{enterprise/search.semantic}}
enterprise/search.embeddings.embedder
@@ -4311,8 +4308,7 @@
enterprise/search.entity-retrieval
{:team "Metabot"
- :ns-prefix "metabase-enterprise.entity-retrieval"
- :api #{metabase-enterprise.entity-retrieval.init}
+ :api #{metabase-enterprise.search.entity-retrieval.init}
:uses #{analytics.interface
app-db
collections
@@ -4333,14 +4329,13 @@
enterprise/search.semantic
{:team "Metabot"
- :ns-prefix "metabase-enterprise.semantic-search"
- :api #{metabase-enterprise.semantic-search.api
- metabase-enterprise.semantic-search.core
- metabase-enterprise.semantic-search.db.datasource
- metabase-enterprise.semantic-search.embedding
- metabase-enterprise.semantic-search.embedding-health
- metabase-enterprise.semantic-search.init
- metabase-enterprise.semantic-search.util}
+ :api #{metabase-enterprise.search.semantic.api
+ metabase-enterprise.search.semantic.core
+ metabase-enterprise.search.semantic.db.datasource
+ metabase-enterprise.search.semantic.embedding
+ metabase-enterprise.search.semantic.embedding-health
+ metabase-enterprise.search.semantic.init
+ metabase-enterprise.search.semantic.util}
:uses #{activity-feed
analytics
analytics.interface
diff --git a/.clj-kondo/ratchets-test.edn b/.clj-kondo/ratchets-test.edn
index 0e9a87cb674..806402938d1 100644
--- a/.clj-kondo/ratchets-test.edn
+++ b/.clj-kondo/ratchets-test.edn
@@ -34,22 +34,22 @@
:unused-private-var 2}
:discouraged-namespace-counts {:clojure.tools.logging 2
:toucan2.core 1}
- :discouraged-var-counts {:clojure.core/pr 1
- :clojure.core/print 1
- :clojure.core/printf 2
- :clojure.core/println 9
- :clojure.core/prn 1
- :clojure.core/time 1
- :clojure.java.jdbc/get-connection 1
- :clojure.java.jdbc/with-db-connection 1
- :clojure.pprint/print-table 1
- :clojure.string/lower-case 1
- :compojure.core/routes 2
- :ee.entity-retrieval.core/search-unfiltered 6
- :entity-retrieval.core/search-unfiltered 1
- :entity-retrieval.mirror/search-unfiltered 1
- :lib.equality/find-column-indexes-for-refs 2
- :test/with-temp 30}
+ :discouraged-var-counts {:clojure.core/pr 1
+ :clojure.core/print 1
+ :clojure.core/printf 2
+ :clojure.core/println 9
+ :clojure.core/prn 1
+ :clojure.core/time 1
+ :clojure.java.jdbc/get-connection 1
+ :clojure.java.jdbc/with-db-connection 1
+ :clojure.pprint/print-table 1
+ :clojure.string/lower-case 1
+ :compojure.core/routes 2
+ :ee.search.entity-retrieval.core/search-unfiltered 6
+ :lib.equality/find-column-indexes-for-refs 2
+ :search.entity-retrieval.core/search-unfiltered 1
+ :search.entity-retrieval.mirror/search-unfiltered 1
+ :test/with-temp 30}
:comment-exempt #{:deprecated-namespace
:discouraged-namespace
:discouraged-var
diff --git a/.clj-kondo/ratchets.edn b/.clj-kondo/ratchets.edn
index 8777207e11f..1d4b2a407f4 100644
--- a/.clj-kondo/ratchets.edn
+++ b/.clj-kondo/ratchets.edn
@@ -73,8 +73,6 @@
:ee.transform-testing.expectations.empty/->Empty 1
:ee.transform-testing.expectations.equals/->EqualsRows 1
:ee.transform-testing.expectations.equals/->EqualsSql 1
- :entity-retrieval.core/search-unfiltered 1
- :entity-retrieval.mirror/search-unfiltered 1
:lib.core/->legacy-MBQL 10
:lib.equality/find-column-indexes-for-refs 1
:malli.core/explain 1
@@ -82,7 +80,9 @@
:malli.core/validate 1
:malli.core/validator 1
:me.flowthing.pp/pprint 2
- :next.jdbc/active-tx? 1}
+ :next.jdbc/active-tx? 1
+ :search.entity-retrieval.core/search-unfiltered 1
+ :search.entity-retrieval.mirror/search-unfiltered 1}
:config-counts {:constant-condition 1
:deprecated-namespace 7
:deprecated-var 16
diff --git a/.clj-kondo/src/hooks/metabase/toucan/table_name.clj b/.clj-kondo/src/hooks/metabase/toucan/table_name.clj
index 1ba186c64cf..fc4019814a8 100644
--- a/.clj-kondo/src/hooks/metabase/toucan/table_name.clj
+++ b/.clj-kondo/src/hooks/metabase/toucan/table_name.clj
@@ -1,6 +1,7 @@
(ns hooks.metabase.toucan.table-name
"Lint that toucan2 model namespaces (those defining `t2/table-name`) live
- under `metabase[-enterprise]/<module>/models[/…]`.
+ under `metabase[-enterprise]/<module>/models[/…]`, where `<module>` may be a
+ nested module directory such as `search/semantic`.
This wraps the methodical `defmethod` hook: we delegate to
`hooks.methodical.macros/defmethod` for the actual analysis (so arg bindings
@@ -12,7 +13,9 @@
(defn- models-file? [filename]
(boolean
(and filename
- (re-find #"/(?:metabase|metabase_enterprise)/[^/]+/models(?:/|\.clj[cs]?$)"
+ ;; anchored at the source root so a `metabase` directory above it can't match, and one level of nesting so
+ ;; nested module directories like `search/semantic/models` pass
+ (re-find #"(?:^|/)(?:src|test)/(?:metabase|metabase_enterprise)/[^/]+(?:/[^/]+)?/models(?:/|\.clj[cs]?$)"
filename))))
(defn- table-name-dispatch? [sym]
diff --git a/.clj-kondo/test/hooks/metabase/toucan/table_name_test.clj b/.clj-kondo/test/hooks/metabase/toucan/table_name_test.clj
index 7792ba6cd26..5e9a06b7573 100644
--- a/.clj-kondo/test/hooks/metabase/toucan/table_name_test.clj
+++ b/.clj-kondo/test/hooks/metabase/toucan/table_name_test.clj
@@ -34,9 +34,20 @@
(testing "defmethod t2/table-name inside <module>/models/<model>.clj is allowed"
(is (empty? (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
"/repo/src/metabase/foo/models/bar.clj"))))
+ (testing "nested module directories are also allowed"
+ (is (empty? (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
+ "/repo/enterprise/backend/src/metabase_enterprise/foo/bar/models/baz.clj"))))
(testing "enterprise modules are also allowed"
(is (empty? (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
"/repo/enterprise/backend/src/metabase_enterprise/foo/models.clj"))))
+ (testing "a `metabase` directory above the source root doesn't make the legacy models directory pass"
+ (is (=? [{:type :metabase/toucan-model-ns}]
+ (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
+ "/home/runner/work/metabase/metabase/src/metabase/models/foo.clj"))))
+ (testing "nesting deeper than one module level is flagged"
+ (is (=? [{:type :metabase/toucan-model-ns}]
+ (lint-defmethod '(defmethod t2/table-name :model/Foo [_] :foo)
+ "/repo/src/metabase/foo/bar/baz/models/qux.clj"))))
(testing "toucan2.core/table-name is also recognized"
(is (=? [{:type :metabase/toucan-model-ns}]
(lint-defmethod '(defmethod toucan2.core/table-name :model/Foo [_] :foo)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 205176174d8..5f0244ff822 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -67,6 +67,8 @@ enterprise/frontend/src/metabase-enterprise/metabot @metabase/metabot-frontend
frontend/src/metabase/metabot @metabase/metabot-frontend
# @metabase/metabot-backend
+# TODO (Chris 2026-09-25) -- drop the embeddings, entity_retrieval and semantic_search lines once no open PR has
+# files at those pre-move paths. Until then they keep Metabot as a required reviewer on PRs that haven't rebased.
enterprise/backend/src/metabase_enterprise/embeddings @metabase/metabot-backend
enterprise/backend/src/metabase_enterprise/entity_retrieval @metabase/metabot-backend
enterprise/backend/src/metabase_enterprise/search @metabase/metabot-backend
diff --git a/.github/file-paths.yaml b/.github/file-paths.yaml
index da7d7ad7309..9c6998f8df8 100644
--- a/.github/file-paths.yaml
+++ b/.github/file-paths.yaml
@@ -365,14 +365,14 @@ embedder_plugin:
- "enterprise/backend/src/metabase_enterprise/data_complexity_score/complexity_embedders.clj"
- "enterprise/backend/src/metabase_enterprise/data_complexity_score/settings.clj"
- "enterprise/backend/src/metabase_enterprise/data_complexity_score/synonym_source.clj"
- - "enterprise/backend/src/metabase_enterprise/semantic_search/embedding.clj"
- - "enterprise/backend/src/metabase_enterprise/semantic_search/settings.clj"
- - "enterprise/backend/test/metabase_enterprise/semantic_search/appdb_pgvector_mode_test.clj"
- - "enterprise/backend/test/metabase_enterprise/semantic_search/embedding_test.clj"
- - "src/metabase/embeddings/provider.clj"
- - "src/metabase/embeddings/startup.clj"
+ - "enterprise/backend/src/metabase_enterprise/search/semantic/embedding.clj"
+ - "enterprise/backend/src/metabase_enterprise/search/semantic/settings.clj"
+ - "enterprise/backend/test/metabase_enterprise/search/semantic/appdb_pgvector_mode_test.clj"
+ - "enterprise/backend/test/metabase_enterprise/search/semantic/embedding_test.clj"
- "src/metabase/plugins/**"
- - "test/metabase/embeddings/embedder_plugin_artifact_test.clj"
+ - "src/metabase/search/embeddings/provider.clj"
+ - "src/metabase/search/embeddings/startup.clj"
+ - "test/metabase/search/embeddings/embedder_plugin_artifact_test.clj"
serialization_baseline:
- ".github/workflows/serialization.yml"
diff --git a/.github/workflows/build-scripts.yml b/.github/workflows/build-scripts.yml
index 8e66a53ec26..d616cdefd59 100644
--- a/.github/workflows/build-scripts.yml
+++ b/.github/workflows/build-scripts.yml
@@ -45,7 +45,7 @@ jobs:
MB_PLUGINS_DIR: modules/embedder/target
run: >-
./bin/test-agent --oss :only
- '[metabase.embeddings.embedder-plugin-artifact-test]'
+ '[metabase.search.embeddings.embedder-plugin-artifact-test]'
- name: Run in-process semantic-search round trip
env:
MB_DB_TYPE: postgres
@@ -58,7 +58,7 @@ jobs:
MB_PLUGINS_DIR: modules/embedder/target
run: >-
./bin/test-agent --drivers=postgres :only
- '[metabase-enterprise.semantic-search.appdb-pgvector-mode-test/appdb-pgvector-in-process-embedder-round-trip-test]'
+ '[metabase-enterprise.search.semantic.appdb-pgvector-mode-test/appdb-pgvector-in-process-embedder-round-trip-test]'
test-build-scripts:
needs: gate
diff --git a/.github/workflows/semantic-search.yml b/.github/workflows/semantic-search.yml
index b6555ffc966..08b0aa081f1 100644
--- a/.github/workflows/semantic-search.yml
+++ b/.github/workflows/semantic-search.yml
@@ -41,7 +41,7 @@ jobs:
- name: Semantic Search Tests
build-static-viz: false
test-args: >-
- :only '["enterprise/backend/test/metabase_enterprise/semantic_search" "enterprise/backend/test/metabase_enterprise/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
+ :only '["enterprise/backend/test/metabase_enterprise/search/semantic" "enterprise/backend/test/metabase_enterprise/search/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
exclude-tag: ':mb/driver-tests'
services:
@@ -91,7 +91,7 @@ jobs:
- name: Semantic Search Tests
build-static-viz: false
test-args: >-
- :only '["enterprise/backend/test/metabase_enterprise/semantic_search" "enterprise/backend/test/metabase_enterprise/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
+ :only '["enterprise/backend/test/metabase_enterprise/search/semantic" "enterprise/backend/test/metabase_enterprise/search/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
exclude-tag: ':mb/driver-tests'
services:
@@ -164,7 +164,7 @@ jobs:
- name: Semantic Search Tests
build-static-viz: false
test-args: >-
- :only '["enterprise/backend/test/metabase_enterprise/semantic_search" "enterprise/backend/test/metabase_enterprise/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
+ :only '["enterprise/backend/test/metabase_enterprise/search/semantic" "enterprise/backend/test/metabase_enterprise/search/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
exclude-tag: ':mb/driver-tests'
services:
@@ -234,7 +234,7 @@ jobs:
- name: Semantic Search Tests
build-static-viz: false
test-args: >-
- :only '["enterprise/backend/test/metabase_enterprise/semantic_search" "enterprise/backend/test/metabase_enterprise/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
+ :only '["enterprise/backend/test/metabase_enterprise/search/semantic" "enterprise/backend/test/metabase_enterprise/search/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
exclude-tag: ':mb/driver-tests'
services:
@@ -297,7 +297,7 @@ jobs:
- name: Semantic Search Tests
build-static-viz: false
test-args: >-
- :only '["enterprise/backend/test/metabase_enterprise/semantic_search" "enterprise/backend/test/metabase_enterprise/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
+ :only '["enterprise/backend/test/metabase_enterprise/search/semantic" "enterprise/backend/test/metabase_enterprise/search/entity_retrieval" "enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj"]'
exclude-tag: ':mb/driver-tests'
services:
diff --git a/dev/src/dev/semantic_search/recall.clj b/dev/src/dev/semantic_search/recall.clj
index 93da369cd18..70ea8299834 100644
--- a/dev/src/dev/semantic_search/recall.clj
+++ b/dev/src/dev/semantic_search/recall.clj
@@ -19,9 +19,9 @@
Requires `init-semantic-search!` to have run (active index) and a superuser id to bind for permission checks."
(:require
[clojure.pprint :as pprint]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
[metabase.request.core :as request]))
(set! *warn-on-reflection* true)
diff --git a/dev/src/dev/semantic_search/shootout.clj b/dev/src/dev/semantic_search/shootout.clj
index 68c081f12f3..f61d7ce0808 100644
--- a/dev/src/dev/semantic_search/shootout.clj
+++ b/dev/src/dev/semantic_search/shootout.clj
@@ -13,7 +13,7 @@
would touch, and which plan node the planner chose. Cache warmth is controlled with warmup runs.
This intentionally re-implements the minimal SQL shapes rather than reusing the production builders in
- `metabase-enterprise.semantic-search.index`, because those select index-specific columns that a generic
+ `metabase-enterprise.search.semantic.index`, because those select index-specific columns that a generic
dump need not have."
(:require
[clojure.pprint :as pprint]
@@ -139,7 +139,7 @@
;; EXPLAIN reports per-loop averages. Row counts are per-loop, so a parallel scan (loops = workers)
;; needs the multiply for the true total; "Actual Total Time" is also per-loop but the workers run
;; concurrently, so it already approximates wall clock and must NOT be multiplied. (Matches the
- ;; production scan-node-metrics in semantic_search/index.clj.)
+ ;; production scan-node-metrics in search/semantic/index.clj.)
:inner-ms (get node "Actual Total Time" 0)
:node-type (get node "Node Type")
:index-name (get node "Index Name")
diff --git a/enterprise/backend/src/metabase_enterprise/analytics/stats.clj b/enterprise/backend/src/metabase_enterprise/analytics/stats.clj
index 744502c94c4..cb7f0e87829 100644
--- a/enterprise/backend/src/metabase_enterprise/analytics/stats.clj
+++ b/enterprise/backend/src/metabase_enterprise/analytics/stats.clj
@@ -4,7 +4,7 @@
[metabase-enterprise.analytics.db :as analytics.db]
[metabase-enterprise.mfa.core :as mfa]
[metabase-enterprise.scim.core :as scim]
- [metabase-enterprise.semantic-search.core :as semantic-search]
+ [metabase-enterprise.search.semantic.core :as semantic-search]
[metabase-enterprise.sso.settings :as ee-sso-settings]
[metabase.driver :as driver]
[metabase.premium-features.core :as premium-features :refer [defenterprise]]))
diff --git a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj b/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
index 7f81a3c1c42..7431b81a000 100644
--- a/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
+++ b/enterprise/backend/src/metabase_enterprise/api_routes/routes.clj
@@ -38,8 +38,8 @@
[metabase-enterprise.replacement.api]
[metabase-enterprise.sandbox.api.routes]
[metabase-enterprise.scim.routes]
+ [metabase-enterprise.search.semantic.api]
[metabase-enterprise.security-center.api]
- [metabase-enterprise.semantic-search.api]
[metabase-enterprise.serialization.api]
[metabase-enterprise.session-management.api]
[metabase-enterprise.stale.api]
@@ -166,7 +166,7 @@
"/transforms" (premium-handler metabase-enterprise.transforms.api/routes :transforms-python)
"/transforms-python" (premium-handler metabase-enterprise.transforms-python.api/routes :transforms-python)
"/scim" (premium-handler metabase-enterprise.scim.routes/routes :scim)
- "/semantic-search" (premium-handler metabase-enterprise.semantic-search.api/routes :semantic-search)
+ "/semantic-search" (premium-handler metabase-enterprise.search.semantic.api/routes :semantic-search)
"/security-center" (premium-handler metabase-enterprise.security-center.api/routes :admin-security-center)
"/serialization" (premium-handler metabase-enterprise.serialization.api/routes :serialization)
"/session-management" (premium-handler metabase-enterprise.session-management.api/routes :session-management)
diff --git a/enterprise/backend/src/metabase_enterprise/core/init.clj b/enterprise/backend/src/metabase_enterprise/core/init.clj
index aa53d16f9c0..8cc8395e20e 100644
--- a/enterprise/backend/src/metabase_enterprise/core/init.clj
+++ b/enterprise/backend/src/metabase_enterprise/core/init.clj
@@ -18,7 +18,6 @@
[metabase-enterprise.data-complexity-score.init]
[metabase-enterprise.database-replication.init]
[metabase-enterprise.dependencies.init]
- [metabase-enterprise.entity-retrieval.init]
[metabase-enterprise.gsheets.init]
[metabase-enterprise.mcp.init]
[metabase-enterprise.memoize-monitor.init]
@@ -26,8 +25,9 @@
[metabase-enterprise.mfa.init]
[metabase-enterprise.remote-sync.init]
[metabase-enterprise.scim.init]
+ [metabase-enterprise.search.entity-retrieval.init]
+ [metabase-enterprise.search.semantic.init]
[metabase-enterprise.security-center.init]
- [metabase-enterprise.semantic-search.init]
[metabase-enterprise.serialization.init]
[metabase-enterprise.sso.init]
[metabase-enterprise.stale.init]
diff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/cli.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/cli.clj
index a6d8a37198a..f4bb4134b4d 100644
--- a/enterprise/backend/src/metabase_enterprise/data_complexity_score/cli.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/cli.clj
@@ -40,7 +40,7 @@
;; Loaded for side-effect: derives setting :on-change event topics from :metabase/event.
;; metabase.core.core/entrypoint normally does this, but the standalone CLI bypasses it.
[metabase.driver.init]
- [metabase.embeddings.startup :as embeddings.startup]
+ [metabase.search.embeddings.startup :as embeddings.startup]
[metabase.util.json :as json]))
(set! *warn-on-reflection* true)
diff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/complexity_embedders.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/complexity_embedders.clj
index cdd6b5f3804..806e4089242 100644
--- a/enterprise/backend/src/metabase_enterprise/data_complexity_score/complexity_embedders.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/complexity_embedders.clj
@@ -5,7 +5,7 @@
`{normalized-name -> ^floats vector}`, omitting entities without a known vector."
(:require
[clojure.string :as str]
- [metabase-enterprise.embeddings.client :as embeddings]
+ [metabase-enterprise.search.embeddings.client :as embeddings]
[metabase.util :as u]))
(set! *warn-on-reflection* true)
@@ -55,7 +55,7 @@
"Return `v` as a `float[]`, copying only when it isn't already one.
ai-service / openai providers already return primitive `float[]` (see `decode-embeddings`
- in `metabase-enterprise.semantic-search.embedding`), so the common path skips the copy."
+ in `metabase-enterprise.search.semantic.embedding`), so the common path skips the copy."
^floats [v]
(if (instance? floats-class v) v (float-array v)))
diff --git a/enterprise/backend/src/metabase_enterprise/data_complexity_score/synonym_source.clj b/enterprise/backend/src/metabase_enterprise/data_complexity_score/synonym_source.clj
index 9ab6d1b786a..557dd8bc89c 100644
--- a/enterprise/backend/src/metabase_enterprise/data_complexity_score/synonym_source.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_complexity_score/synonym_source.clj
@@ -8,7 +8,7 @@
(:require
[metabase-enterprise.data-complexity-score.complexity-embedders :as embedders]
[metabase-enterprise.data-complexity-score.settings :as settings]
- [metabase-enterprise.semantic-search.core :as semantic-search]))
+ [metabase-enterprise.search.semantic.core :as semantic-search]))
(defn- configured-model-descriptor
"`{:provider :model-name :model-dimensions}` from the synonym-axis settings."
diff --git a/enterprise/backend/src/metabase_enterprise/entity_retrieval/init.clj b/enterprise/backend/src/metabase_enterprise/entity_retrieval/init.clj
deleted file mode 100644
index d86f66e7734..00000000000
--- a/enterprise/backend/src/metabase_enterprise/entity_retrieval/init.clj
+++ /dev/null
@@ -1,6 +0,0 @@
-(ns metabase-enterprise.entity-retrieval.init
- "Loads the entity-retrieval module's side-effecting namespaces (the background sync task) at
- system startup. See [[metabase-enterprise.core.init]]."
- (:require
- [metabase-enterprise.entity-retrieval.health]
- [metabase-enterprise.entity-retrieval.task.sync]))
diff --git a/enterprise/backend/src/metabase_enterprise/embeddings/client.clj b/enterprise/backend/src/metabase_enterprise/search/embeddings/client.clj
similarity index 87%
rename from enterprise/backend/src/metabase_enterprise/embeddings/client.clj
rename to enterprise/backend/src/metabase_enterprise/search/embeddings/client.clj
index ce40a34dd04..b5827211e36 100644
--- a/enterprise/backend/src/metabase_enterprise/embeddings/client.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/embeddings/client.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.embeddings.client
+(ns metabase-enterprise.search.embeddings.client
"Embedding-service RPC for callers outside the search engine.
This namespace is a thin neutral entry point so consumers like the data-complexity-score's
@@ -7,15 +7,15 @@
TODO: relocate the implementation here. Today the provider dispatch + HTTP impls (ollama,
ai-service, openai) and the embedding-service settings (`ee-embedding-service-base-url`,
- `ee-embedding-service-api-key`, etc.) all live in `metabase-enterprise.semantic-search.*` —
+ `ee-embedding-service-api-key`, etc.) all live in `metabase-enterprise.search.semantic.*` —
they predate this namespace because semantic-search was the first consumer.
Steps for the move:
1. Migrate the `get-embedding` / `get-embeddings-batch` / `pull-model` defmultis and
- provider impls (currently in `metabase-enterprise.semantic-search.embedding`) into
- `metabase-enterprise.embeddings.*`.
+ provider impls (currently in `metabase-enterprise.search.semantic.embedding`) into
+ `metabase-enterprise.search.embeddings.*`.
2. Migrate the embedding-service settings into the same module (or a sibling
- `metabase-enterprise.embeddings.settings` ns).
+ `metabase-enterprise.search.embeddings.settings` ns).
3. Decouple the inline token-tracking calls (`semantic.models.token-tracking/record-tokens`,
`:metabase-search/semantic-embedding-tokens`, the snowplow `track-token-usage!`) — make
them a hookable callback so callers register their own analytics scope. Semantic-search
@@ -27,7 +27,7 @@
`clean-model-name`) and `get-configured-model` / `process-embeddings-streaming` stay in
semantic-search — they're search-engine-specific."
(:require
- [metabase-enterprise.semantic-search.core :as semantic-search]))
+ [metabase-enterprise.search.semantic.core :as semantic-search]))
(set! *warn-on-reflection* true)
@@ -45,7 +45,7 @@
"Return a sequential collection of embedding vectors, in the same order as the input texts.
`embedding-model` — `{:provider :model-name :model-dimensions}` map; provider must be one of those registered on
- [[metabase.embeddings.provider]] (`ai-service`, `openai`, `ollama`).
+ [[metabase.search.embeddings.provider]] (`ai-service`, `openai`, `ollama`).
`texts` — sequential collection of input strings.
`opts` — optional keyword opts (e.g. `:type :doc`). Accepts alternating kwargs or a single trailing map;
forwarded as kwargs to the provider.
diff --git a/enterprise/backend/src/metabase_enterprise/entity_retrieval/core.clj b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/core.clj
similarity index 96%
rename from enterprise/backend/src/metabase_enterprise/entity_retrieval/core.clj
rename to enterprise/backend/src/metabase_enterprise/search/entity_retrieval/core.clj
index 7c52699ebc4..44affd54c77 100644
--- a/enterprise/backend/src/metabase_enterprise/entity_retrieval/core.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/core.clj
@@ -1,21 +1,21 @@
-(ns metabase-enterprise.entity-retrieval.core
+(ns metabase-enterprise.search.entity-retrieval.core
"Enterprise implementation of the library entity index: pgvector-backed similarity search over the
per-value `library_entity_index` documents, and the write-path nudge that keeps the index fresh.
- OSS shims live in [[metabase.entity-retrieval.mirror]]; the background sync they nudge is the
- [[metabase-enterprise.entity-retrieval.task.sync]] Quartz job."
+ OSS shims live in [[metabase.search.entity-retrieval.mirror]]; the background sync they nudge is the
+ [[metabase-enterprise.search.entity-retrieval.task.sync]] Quartz job."
(:require
[clojure.core.memoize :as memoize]
[clojure.string :as str]
[clojurewerkz.quartzite.jobs :as jobs]
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
- [metabase-enterprise.entity-retrieval.index-table :as index-table]
- [metabase-enterprise.entity-retrieval.reconcile :as reconcile]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.embedding :as embedding]
- [metabase-enterprise.semantic-search.embedding-health :as embedding-health]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.entity-retrieval.index-table :as index-table]
+ [metabase-enterprise.search.entity-retrieval.reconcile :as reconcile]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.embedding :as embedding]
+ [metabase-enterprise.search.semantic.embedding-health :as embedding-health]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.analytics-interface.core :as analytics]
[metabase.app-db.core :as mdb]
[metabase.premium-features.core :as premium-features :refer [defenterprise]]
@@ -30,7 +30,7 @@
(def sync-job-key
"Quartz job key of the periodic full-reconcile backstop, scheduled by
- [[metabase-enterprise.entity-retrieval.task.sync]]."
+ [[metabase-enterprise.search.entity-retrieval.task.sync]]."
(jobs/key "metabase-enterprise.entity-retrieval.sync.job"))
(defn- licensed?
@@ -42,7 +42,7 @@
(defn pgvector-schedulable?
"Whether this instance could have a pgvector store: a dedicated one, or an app db that might host one.
Env and license only, never a query -- the sync task schedules on this, and resolving
- [[metabase-enterprise.semantic-search.db.datasource/pgvector-mode]] would probe the app db of instances
+ [[metabase-enterprise.search.semantic.db.datasource/pgvector-mode]] would probe the app db of instances
that can't use the answer.
Licensing an app-db instance post-boot needs a restart before the job schedules."
[]
@@ -405,7 +405,7 @@
dedupes the (many-per-entity) docs down to distinct entities.
Returns [] when the pgvector store is unconfigured.
- Hits are not permission-filtered — see [[metabase.entity-retrieval.mirror/search-unfiltered]] for what a
+ Hits are not permission-filtered — see [[metabase.search.entity-retrieval.mirror/search-unfiltered]] for what a
caller owes the current user."
:feature :library-retrieval
[user-search-prompt limit]
diff --git a/enterprise/backend/src/metabase_enterprise/entity_retrieval/db.clj b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/db.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/entity_retrieval/db.clj
rename to enterprise/backend/src/metabase_enterprise/search/entity_retrieval/db.clj
index b27b3cda3bb..229092cf05c 100644
--- a/enterprise/backend/src/metabase_enterprise/entity_retrieval/db.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/db.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.entity-retrieval.db
+(ns metabase-enterprise.search.entity-retrieval.db
"Application database queries for the entity-retrieval module. Every function here is a direct Toucan 2 call with no
additional logic, so the rest of the module never talks to `toucan2.core` itself."
(:require
diff --git a/enterprise/backend/src/metabase_enterprise/entity_retrieval/health.clj b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/health.clj
similarity index 94%
rename from enterprise/backend/src/metabase_enterprise/entity_retrieval/health.clj
rename to enterprise/backend/src/metabase_enterprise/search/entity_retrieval/health.clj
index 6259e262c4b..926f6b34bed 100644
--- a/enterprise/backend/src/metabase_enterprise/entity_retrieval/health.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/health.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.entity-retrieval.health
+(ns metabase-enterprise.search.entity-retrieval.health
"Health-inspector check for NLQ (natural-language-query) curated retrieval.
The `:nlq` Metabot profile uses this tool; when the tool is unavailable we swap the profile out for
@@ -16,14 +16,14 @@
(:require
[clojure.core.memoize :as memoize]
[clojure.set :as set]
- [metabase-enterprise.entity-retrieval.core :as entity-retrieval]
- [metabase-enterprise.entity-retrieval.index-table :as index-table]
- [metabase-enterprise.entity-retrieval.reconcile :as reconcile]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.datasource]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.embedding-health :as embedding-health]
- [metabase.entity-retrieval.core :as er]
+ [metabase-enterprise.search.entity-retrieval.core :as entity-retrieval]
+ [metabase-enterprise.search.entity-retrieval.index-table :as index-table]
+ [metabase-enterprise.search.entity-retrieval.reconcile :as reconcile]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.datasource]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.embedding-health :as embedding-health]
[metabase.health-inspector.core :as health-inspector]
+ [metabase.search.entity-retrieval.core :as er]
[metabase.search.index-health :as search.index-health]
[metabase.util :as u]
[next.jdbc :as jdbc]
diff --git a/enterprise/backend/src/metabase_enterprise/entity_retrieval/index_table.clj b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/index_table.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/entity_retrieval/index_table.clj
rename to enterprise/backend/src/metabase_enterprise/search/entity_retrieval/index_table.clj
index 81182f1e11a..32373334c79 100644
--- a/enterprise/backend/src/metabase_enterprise/entity_retrieval/index_table.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/index_table.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.entity-retrieval.index-table
+(ns metabase-enterprise.search.entity-retrieval.index-table
"Lifecycle of the pgvector tables backing the library entity index.
Two tables live in the pgvector store:
@@ -23,8 +23,8 @@
[clojure.string :as str]
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.util.log :as log]
[next.jdbc :as jdbc]
[next.jdbc.result-set :as jdbc.rs])
@@ -36,7 +36,7 @@
(def index-schema
"Schema holding the library entity index, in a dedicated store and on the app db alike.
- Its own, not semantic search's: [[metabase-enterprise.semantic-search.db.migration.impl]] wipes the
+ Its own, not semantic search's: [[metabase-enterprise.search.semantic.db.migration.impl]] wipes the
schema it is given, and a dedicated store's reset sweeps the default schema these tables used to sit in.
It spares the names it recognizes, and ours were never among them -- but an index should not depend on
another module's list of what it may destroy."
@@ -93,7 +93,7 @@
doc-derivation contract (doc_id scheme, doc_type set, doc_text source, dedup/key rules).
It's part of the meta row's [[model-identity]], so bumping it makes [[ensure-tables!]] drop and rebuild
the vectors table; the post-upgrade startup reconcile then repopulates from the appdb under the new
- format. Bump on ANY compatibility-affecting change in [[metabase-enterprise.entity-retrieval.reconcile]]
+ format. Bump on ANY compatibility-affecting change in [[metabase-enterprise.search.entity-retrieval.reconcile]]
or either table schema: a column/type change, a new or renamed doc_type, a changed doc_text
source, or a changed doc_id / dedup / key scheme — anything that makes old rows incomparable to newly
derived desired docs. A bump forces a full re-embed of the library on every instance at upgrade, so do
@@ -318,7 +318,7 @@
Unlike `reconciled_at`, this column is load-bearing: [[read-meta]] reads it and [[model-identity]]
compares it, so a role that cannot add it can never bring the index to a compatible state. Raise a typed
error naming the ownership problem rather than letting a bare SQLSTATE 42501 abort the caller's
- transaction — [[metabase-enterprise.entity-retrieval.core/retrieval-status]] reports it as `:unreachable`
+ transaction — [[metabase-enterprise.search.entity-retrieval.core/retrieval-status]] reports it as `:unreachable`
and the retrieval tool stops being offered until an admin fixes the grant."
[tx]
(let [state (embedding-space-column-state tx)]
diff --git a/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/init.clj b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/init.clj
new file mode 100644
index 00000000000..7e4e9596c15
--- /dev/null
+++ b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/init.clj
@@ -0,0 +1,6 @@
+(ns metabase-enterprise.search.entity-retrieval.init
+ "Loads the entity-retrieval module's side-effecting namespaces (the background sync task) at
+ system startup. See [[metabase-enterprise.core.init]]."
+ (:require
+ [metabase-enterprise.search.entity-retrieval.health]
+ [metabase-enterprise.search.entity-retrieval.task.sync]))
diff --git a/enterprise/backend/src/metabase_enterprise/entity_retrieval/reconcile.clj b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/reconcile.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/entity_retrieval/reconcile.clj
rename to enterprise/backend/src/metabase_enterprise/search/entity_retrieval/reconcile.clj
index a5f138e2bda..2da0be24d66 100644
--- a/enterprise/backend/src/metabase_enterprise/entity_retrieval/reconcile.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/reconcile.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.entity-retrieval.reconcile
+(ns metabase-enterprise.search.entity-retrieval.reconcile
"Reconciles the pgvector `library_entity_index` with the authoritative appdb.
The index holds one embedded document per library-entity value — the entity's name, its description, and
@@ -8,7 +8,7 @@
Curator `instructions` are not stored here — the tool reads them live from `osi_ai_context` at query time.
Two reconcile entry points, both run via the coalescing schedule in
- [[metabase-enterprise.entity-retrieval.core]] and serialized across nodes by one advisory lock:
+ [[metabase-enterprise.search.entity-retrieval.core]] and serialized across nodes by one advisory lock:
- [[reconcile!]] — a full diff: derive the full desired doc set from library membership (published
Tables, library metric/model Cards, and the Measures/Segments on those Tables) plus `osi_ai_context`,
@@ -25,11 +25,11 @@
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
[medley.core :as m]
- [metabase-enterprise.entity-retrieval.db :as entity-retrieval.db]
- [metabase-enterprise.entity-retrieval.index-table :as index-table]
- [metabase-enterprise.semantic-search.embedding :as embedding]
+ [metabase-enterprise.search.entity-retrieval.db :as entity-retrieval.db]
+ [metabase-enterprise.search.entity-retrieval.index-table :as index-table]
+ [metabase-enterprise.search.semantic.embedding :as embedding]
[metabase.collections.core :as collections]
- [metabase.entity-retrieval.core :as entity-retrieval]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
[metabase.util :as u]
[metabase.util.log :as log]
[next.jdbc :as jdbc]
diff --git a/enterprise/backend/src/metabase_enterprise/entity_retrieval/task/sync.clj b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/task/sync.clj
similarity index 92%
rename from enterprise/backend/src/metabase_enterprise/entity_retrieval/task/sync.clj
rename to enterprise/backend/src/metabase_enterprise/search/entity_retrieval/task/sync.clj
index 707bf29f7c4..a12a9bdb067 100644
--- a/enterprise/backend/src/metabase_enterprise/entity_retrieval/task/sync.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/entity_retrieval/task/sync.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.entity-retrieval.task.sync
+(ns metabase-enterprise.search.entity-retrieval.task.sync
"Quartz job running a full library entity index reconcile, on a slow schedule, as the backstop.
Immediate freshness comes from the targeted write path — an `osi_ai_context` edit drives a per-entity
- reconcile (see [[metabase-enterprise.entity-retrieval.core/request-entity-sync!]]) within seconds. This
+ reconcile (see [[metabase-enterprise.search.entity-retrieval.core/request-entity-sync!]]) within seconds. This
periodic full reconcile only catches what isn't hooked: membership / name / description changes to the
underlying Card/Table/Measure/Segment, and any write whose targeted reconcile was lost (scheduler
hiccup, pgvector down, an import that bypassed the model hooks). Its first firing, ~10s after boot, is
@@ -12,7 +12,7 @@
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.simple :as simple]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase-enterprise.entity-retrieval.core :as entity-retrieval.core]
+ [metabase-enterprise.search.entity-retrieval.core :as entity-retrieval.core]
[metabase.task.core :as task]
[metabase.util.log :as log])
(:import
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/api.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/api.clj
similarity index 87%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/api.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/api.clj
index 1a08198e44a..88b69a83de6 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/api.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.semantic-search.api
+(ns metabase-enterprise.search.semantic.api
"/api/ee/semantic-search endpoints"
(:require
[clojure.core.memoize :as memoize]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
[metabase.permissions.core :as perms]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/appdb_scoring.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/appdb_scoring.clj
similarity index 84%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/appdb_scoring.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/appdb_scoring.clj
index 4eaeb4f7d28..19b41e3b6f1 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/appdb_scoring.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/appdb_scoring.clj
@@ -1,6 +1,6 @@
-(ns metabase-enterprise.semantic-search.appdb-scoring
+(ns metabase-enterprise.search.semantic.appdb-scoring
"The app-DB based scorers of semantic search results. Expression building only:
- `metabase-enterprise.semantic-search.db` runs the query, so this namespace must not require it."
+ `metabase-enterprise.search.semantic.db` runs the query, so this namespace must not require it."
(:require
[metabase.search.config :as search.config]
[metabase.search.scoring :as search.scoring]))
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/core.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/core.clj
similarity index 95%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/core.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/core.clj
index d18d18b30ae..367bb5e4003 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/core.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/core.clj
@@ -1,17 +1,17 @@
-(ns metabase-enterprise.semantic-search.core
+(ns metabase-enterprise.search.semantic.core
"Enterprise implementations of semantic search core functions using defenterprise."
(:require
[clojure.string :as str]
[medley.core :as m]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.embedders]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.repair :as semantic.repair]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.embedders]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.repair :as semantic.repair]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.analytics-interface.core :as analytics]
[metabase.premium-features.core :refer [defenterprise]]
[metabase.search.config :as search.config]
@@ -26,10 +26,10 @@
;; import-vars requires full namespace symbols, so it can't use the alias
#_{:clj-kondo/ignore [:aliased-namespace-symbol]}
(p/import-vars
- [metabase-enterprise.semantic-search.embedders
+ [metabase-enterprise.search.semantic.embedders
active-embedding-model
search-index-embedder]
- [metabase-enterprise.semantic-search.embedding
+ [metabase-enterprise.search.semantic.embedding
get-embeddings-batch])
(defn- fallback-engine []
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/db.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/db.clj
similarity index 96%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/db.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/db.clj
index 724ff283919..724a455ca04 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/db.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/db.clj
@@ -1,10 +1,10 @@
-(ns metabase-enterprise.semantic-search.db
+(ns metabase-enterprise.search.semantic.db
"Application database queries for the semantic-search module. Every function here is a direct Toucan 2 call with no
additional logic, so the rest of the module only touches `toucan2.core` for model definitions and hydration methods."
(:require
[malli.util :as mut]
- [metabase-enterprise.semantic-search.appdb-scoring :as appdb-scoring]
- [metabase-enterprise.semantic-search.schema :as semantic-search.schema]
+ [metabase-enterprise.search.semantic.appdb-scoring :as appdb-scoring]
+ [metabase-enterprise.search.semantic.schema :as semantic-search.schema]
[metabase.app-db.core :as mdb]
[metabase.lib.schema.id :as lib.schema.id]
[metabase.search.config :as search.config]
@@ -90,7 +90,7 @@
(mu/defn appdb-scored-rows
"The `:id`/`:model` rows of `search-results` augmented with the app-DB scorers of `search-ctx` (see
- `metabase-enterprise.semantic-search.appdb-scoring/appdb-scorers`), joining the bookmark tables when `:bookmarked`
+ `metabase-enterprise.search.semantic.appdb-scoring/appdb-scorers`), joining the bookmark tables when `:bookmarked`
is among them."
[search-results :- [:sequential [:map {:closed true}
[:id [:or :string ms/PositiveInt]]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/db/connection.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/db/connection.clj
similarity index 74%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/db/connection.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/db/connection.clj
index e70bcb86dfe..96f9ffa529b 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/db/connection.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/db/connection.clj
@@ -1,7 +1,7 @@
-(ns metabase-enterprise.semantic-search.db.connection
+(ns metabase-enterprise.search.semantic.db.connection
(:require
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.db.locking :as semantic.db.locking]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.db.locking :as semantic.db.locking]
[next.jdbc :as jdbc]))
(defn do-with-migrate-tx
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/db/datasource.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/db/datasource.clj
similarity index 99%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/db/datasource.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/db/datasource.clj
index 150fdf693dd..478cb0a41ba 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/db/datasource.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/db/datasource.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.db.datasource
+(ns metabase-enterprise.search.semantic.db.datasource
(:require
[clojure.string :as str]
[environ.core :refer [env]]
@@ -41,7 +41,7 @@
(def app-db-schema
"The Postgres schema holding all semantic-search tables when sharing the application database.
Isolating by schema makes destructive maintenance (see
- [[metabase-enterprise.semantic-search.db.migration.impl]]) structurally incapable of touching
+ [[metabase-enterprise.search.semantic.db.migration.impl]]) structurally incapable of touching
application tables."
"semantic_search")
@@ -443,7 +443,7 @@
pg_available_extensions: managed Postgres often lists the extension as available while denying the DDL.
The probe persists nothing, so the unlicensed and disabled instances whose availability predicates reach
here never mutate the app db; the persisted CREATE EXTENSION / CREATE SCHEMA run only on the activation
- path ([[metabase-enterprise.semantic-search.pgvector-api/init-semantic-search!]]).
+ path ([[metabase-enterprise.search.semantic.pgvector-api/init-semantic-search!]]).
Runs on one [[with-probe-connection]], so a host that stops answering ends the check instead of stranding
the readiness probe, which cannot be interrupted out of a stuck read."
[]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/db/locking.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/db/locking.clj
similarity index 95%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/db/locking.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/db/locking.clj
index 6d14ecfb21a..d6a13b12059 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/db/locking.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/db/locking.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.semantic-search.db.locking
+(ns metabase-enterprise.search.semantic.db.locking
(:require
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
- [metabase-enterprise.semantic-search.db.util :as semantic.db.util]
+ [metabase-enterprise.search.semantic.db.util :as semantic.db.util]
[metabase.util.log :as log]
[next.jdbc :as jdbc])
(:import
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/db/migration.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/db/migration.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/db/migration.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/db/migration.clj
index 5b355584d85..a8113724abf 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/db/migration.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/db/migration.clj
@@ -1,9 +1,9 @@
-(ns metabase-enterprise.semantic-search.db.migration
+(ns metabase-enterprise.search.semantic.db.migration
(:require
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
- [metabase-enterprise.semantic-search.db.migration.impl :as semantic.db.migration.impl]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.db.migration.impl :as semantic.db.migration.impl]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.util.log :as log]
[next.jdbc :as jdbc])
(:import
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/db/migration/impl.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/db/migration/impl.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/db/migration/impl.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/db/migration/impl.clj
index 31640cc0434..6a8d985957e 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/db/migration/impl.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/db/migration/impl.clj
@@ -1,21 +1,21 @@
-(ns metabase-enterprise.semantic-search.db.migration.impl
+(ns metabase-enterprise.search.semantic.db.migration.impl
(:require
[clojure.string :as str]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.db :as semantic-search.db]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.db :as semantic-search.db]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.collections.curation :as collections.curation]
[metabase.config.core :as config]
- [metabase.embeddings.provider :as embeddings.provider]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.util :as u]
[metabase.util.log :as log]
[next.jdbc :as jdbc]
[next.jdbc.result-set :as jdbc.rs]))
(def schema-version
- "Version to compare the [[metabase-enterprise.semantic-search.db.migration/db-version]] with. If this is higher,
+ "Version to compare the [[metabase-enterprise.search.semantic.db.migration/db-version]] with. If this is higher,
schema migration will be performed."
3)
@@ -27,12 +27,12 @@
(def ^:private dlq-table-pattern
"One dead-letter queue per index, `dlq_<index-id>`
- (see [[metabase-enterprise.semantic-search.dlq/dlq-table-name-kw]])."
+ (see [[metabase-enterprise.search.semantic.dlq/dlq-table-name-kw]])."
#"\Adlq_\d+\z")
(def ^:private repair-table-pattern
"Repair's scratch tables, `repair_<millis>_<6 chars>`
- (see [[metabase-enterprise.semantic-search.repair/repair-table-name]])."
+ (see [[metabase-enterprise.search.semantic.repair/repair-table-name]])."
#"\Arepair_\d+_[a-z0-9]{6}\z")
(defn- semantic-search-table?
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/db/store_health.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/db/store_health.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/db/store_health.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/db/store_health.clj
index edfbe2f7fa5..e093a4c2dda 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/db/store_health.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/db/store_health.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.semantic-search.db.store-health
+(ns metabase-enterprise.search.semantic.db.store-health
"Readiness of the pgvector store itself -- can this instance reach a vector database, and which one.
The store is shared: semantic search and entity retrieval each provision their own tables in it, as more
may later, so this reports the store rather than any one feature's index.
- Index health lives in [[metabase-enterprise.semantic-search.health]]."
+ Index health lives in [[metabase-enterprise.search.semantic.health]]."
(:require
- [metabase-enterprise.semantic-search.db.datasource :as semantic.datasource]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.datasource]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.analytics-interface.core :as analytics]
[metabase.analytics.core :as analytics.core]
[metabase.app-db.core :as mdb]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/db/util.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/db/util.clj
similarity index 93%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/db/util.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/db/util.clj
index 6c76fb269f1..278072c4c58 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/db/util.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/db/util.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.db.util
+(ns metabase-enterprise.search.semantic.db.util
(:require
[next.jdbc :as jdbc]))
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/dlq.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/dlq.clj
similarity index 99%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/dlq.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/dlq.clj
index 007562c748e..1eb3d65f8cd 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/dlq.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/dlq.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.dlq
+(ns metabase-enterprise.search.semantic.dlq
"Dead Letter Queue (DLQ) implementation for semantic search indexing.
This namespace provides a dead letter queue system that handles failed semantic search
@@ -20,9 +20,9 @@
Even 'permanent' errors are retried however - due to inherent ambiguity - it just effects the backoff climb."
(:require
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.gate :as semantic.gate]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.gate :as semantic.gate]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.util :as u]
[metabase.util.log :as log]
[next.jdbc :as jdbc]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/docker-compose.yml b/enterprise/backend/src/metabase_enterprise/search/semantic/docker-compose.yml
similarity index 88%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/docker-compose.yml
rename to enterprise/backend/src/metabase_enterprise/search/semantic/docker-compose.yml
index dfa8e2ada01..f313884a96d 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/docker-compose.yml
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/docker-compose.yml
@@ -3,6 +3,9 @@
# extension available, semantic search automatically runs against the app db — its tables live in a
# dedicated `semantic_search` schema and share the app-db connection pool (so heavy reindexing competes
# with regular app-db traffic; use a dedicated database when that matters).
+# Compose names a project after its directory. Pin the name so volumes created from the old `semantic_search`
+# directory stay in use.
+name: semantic_search
version: '3.8'
services:
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/embedders.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/embedders.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/embedders.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/embedders.clj
index 5a9165bb6a6..f7dc7d27e07 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/embedders.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/embedders.clj
@@ -1,12 +1,12 @@
-(ns metabase-enterprise.semantic-search.embedders
+(ns metabase-enterprise.search.semantic.embedders
"Embedders that expose the pgvector semantic-search index as a name → vector lookup.
An embedder takes entity maps `{:id :name :kind}` and returns `{normalized-name → ^floats vector}`,
omitting entities not in the index."
(:require
[clojure.string :as str]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
[metabase.metabot.core :as metabot]
[metabase.util :as u]
[metabase.util.log :as log]
@@ -165,7 +165,7 @@
(defn active-embedding-model
"Return the embedding model metadata for the *active* search index, not the current configuration.
Returns nil when the index is unreachable, not yet initialized, or the feature is disabled.
- Use this instead of [[metabase-enterprise.semantic-search.env/get-configured-embedding-model]] when
+ Use this instead of [[metabase-enterprise.search.semantic.env/get-configured-embedding-model]] when
you need to know what model the index is *actually* serving — not just what the settings say.
The returned map matches the shape produced by the synonym-axis settings in
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/embedding.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/embedding.clj
similarity index 99%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/embedding.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/embedding.clj
index 0e9f2772f6c..efd0eddcd4e 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/embedding.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/embedding.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.embedding
+(ns metabase-enterprise.search.semantic.embedding
(:require
[buddy.core.codecs :as buddy-codecs]
[buddy.core.hash :as buddy-hash]
@@ -6,14 +6,14 @@
[clojure.string :as str]
[diehard.circuit-breaker :as dh.cb]
[flatland.ordered.set :refer [ordered-set]]
- [metabase-enterprise.semantic-search.models.token-tracking :as semantic.models.token-tracking]
- [metabase-enterprise.semantic-search.settings :as semantic-settings]
+ [metabase-enterprise.search.semantic.models.token-tracking :as semantic.models.token-tracking]
+ [metabase-enterprise.search.semantic.settings :as semantic-settings]
[metabase.analytics-interface.core :as analytics]
[metabase.analytics.core :as analytics.core]
- [metabase.embeddings.provider :as embeddings.provider]
[metabase.llm.provider :as llm.provider]
[metabase.llm.settings :as llm.settings]
[metabase.premium-features.core :as premium-features]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.settings.core :as setting]
[metabase.tracing.core :as tracing]
[metabase.util :as u]
@@ -224,7 +224,7 @@
;;;
;;; The breaker wraps the HTTP providers defined below rather than sitting behind the provider SPI, since
;;; it keys circuits by remote endpoint and an in-process provider has none. If a second provider that
-;;; needs it turns up, move it into `metabase.embeddings.provider` instead of adding a second copy.
+;;; needs it turns up, move it into `metabase.search.embeddings.provider` instead of adding a second copy.
(def ^:private embedder-circuit-breaker-failure-threshold
"Consecutive embedding-service failures that trip the breaker open." 5)
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/embedding_health.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/embedding_health.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/embedding_health.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/embedding_health.clj
index c706588a1fe..0f8c288b309 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/embedding_health.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/embedding_health.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.semantic-search.embedding-health
+(ns metabase-enterprise.search.semantic.embedding-health
"Embedding-service liveness and circuit recovery shared by semantic search and entity retrieval."
(:require
[clojure.core.memoize :as memoize]
- [metabase-enterprise.semantic-search.embedding :as embedding]
+ [metabase-enterprise.search.semantic.embedding :as embedding]
[metabase.util.log :as log])
(:import
(java.util.concurrent Executors ScheduledExecutorService ThreadFactory TimeUnit)))
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/env.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/env.clj
similarity index 82%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/env.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/env.clj
index ec73a6e6368..3758e6eb62a 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/env.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/env.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.semantic-search.env
+(ns metabase-enterprise.search.semantic.env
(:require
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]))
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]))
;; global configuration / state containment facility
;; only core and the task definitions (for which integration with metabase demands globals)
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/events.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/events.clj
similarity index 79%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/events.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/events.clj
index af01bafcbbc..2a5ae876960 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/events.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/events.clj
@@ -1,7 +1,7 @@
-(ns metabase-enterprise.semantic-search.events
+(ns metabase-enterprise.search.semantic.events
"Event handlers for the semantic-search module."
(:require
- [metabase-enterprise.semantic-search.core :as semantic.core]
+ [metabase-enterprise.search.semantic.core :as semantic.core]
[metabase.events.core :as events]
[methodical.core :as methodical]))
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/gate.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/gate.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/gate.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/gate.clj
index 434bb682245..51acb366c33 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/gate.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/gate.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.gate
+(ns metabase-enterprise.search.semantic.gate
"The gate table (managed by index-metadata) decouples document ingestion from embedding computation and indexing.
By avoiding producer/consumer coupling in this instance we get some advantages:
@@ -21,8 +21,8 @@
(:require
[buddy.core.hash :as buddy-hash]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.analytics-interface.core :as analytics]
[metabase.util :as u]
[metabase.util.json :as json]
@@ -282,8 +282,8 @@
nil))
(comment
- (def pgvector ((requiring-resolve 'metabase-enterprise.semantic-search.env/get-pgvector-datasource!)))
- (def index-metadata ((requiring-resolve 'metabase-enterprise.semantic-search.env/get-index-metadata)))
+ (def pgvector ((requiring-resolve 'metabase-enterprise.search.semantic.env/get-pgvector-datasource!)))
+ (def index-metadata ((requiring-resolve 'metabase-enterprise.search.semantic.env/get-index-metadata)))
(def search-docs (vec ((requiring-resolve 'metabase.search.ingestion/searchable-documents))))
(def null-updated-at (filter #(nil? (:updated_at %)) search-docs))
@@ -316,7 +316,7 @@
(next-watermark watermark poll-result)
(def active-index-state
- ((requiring-resolve 'metabase-enterprise.semantic-search.index-metadata/get-active-index-state)
+ ((requiring-resolve 'metabase-enterprise.search.semantic.index-metadata/get-active-index-state)
pgvector
index-metadata))
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/health.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/health.clj
similarity index 96%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/health.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/health.clj
index f14a08791c2..b1d0443c1ea 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/health.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/health.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.health
+(ns metabase-enterprise.search.semantic.health
"Health-inspector checks and index metrics for semantic search.
Semantic search degrades silently -- a missing index, stalled indexer, or unreachable embedder just falls
@@ -11,14 +11,14 @@
(:require
[clojure.core.memoize :as memoize]
[clojure.string :as str]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.embedding-health :as embedding-health]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.embedding-health :as embedding-health]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.health-inspector.core :as health-inspector]
[metabase.search.config :as search.config]
[metabase.search.index-health :as search.index-health]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/index.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/index.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/index.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/index.clj
index 3e97b3b3a9d..bdd7e74c575 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/index.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/index.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.index
+(ns metabase-enterprise.search.semantic.index
(:require
[buddy.core.codecs :as buddy-codecs]
[buddy.core.hash :as buddy-hash]
@@ -8,13 +8,13 @@
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
[java-time.api :as t]
- [metabase-enterprise.semantic-search.appdb-scoring :as appdb-scoring]
- [metabase-enterprise.semantic-search.db :as semantic-search.db]
+ [metabase-enterprise.search.semantic.appdb-scoring :as appdb-scoring]
+ [metabase-enterprise.search.semantic.db :as semantic-search.db]
;; TODO: extract schema code to go under db.migration
- [metabase-enterprise.semantic-search.embedding :as embedding]
- [metabase-enterprise.semantic-search.scoring :as scoring]
- [metabase-enterprise.semantic-search.settings :as semantic-settings]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.embedding :as embedding]
+ [metabase-enterprise.search.semantic.scoring :as scoring]
+ [metabase-enterprise.search.semantic.settings :as semantic-settings]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.analytics-interface.core :as analytics]
[metabase.models.interface :as mi]
[metabase.permissions.core :as perms]
@@ -37,8 +37,8 @@
(set! *warn-on-reflection* true)
(comment
- ((requiring-resolve 'metabase-enterprise.semantic-search.db.datasource/init-db!))
- (def db @@(requiring-resolve 'metabase-enterprise.semantic-search.db.datasource/data-source)))
+ ((requiring-resolve 'metabase-enterprise.search.semantic.db.datasource/init-db!))
+ (def db @@(requiring-resolve 'metabase-enterprise.search.semantic.db.datasource/data-source)))
(defn sql-format-quoted
"Call [[sql/format]] with {:quoted true}.
@@ -297,7 +297,7 @@
(def ^:private index-table-name-pattern
"Recognizes every table-name shape produced by [[model-table-name]] (optionally with the force-reset
- suffix appended by [[metabase-enterprise.semantic-search.pgvector-api/fresh-index]]),
+ suffix appended by [[metabase-enterprise.search.semantic.pgvector-api/fresh-index]]),
[[hash-identifier-if-exceeds-pg-limit]], and the legacy pre-BOT-337 naming era:
index_<provider>_<model>_<dims> legacy name
@@ -511,7 +511,7 @@
HNSW indexes are expensive to build and maintain, so we only create one when an instance is configured for
an HNSW-index-backed vector-search strategy (`:hnsw` or `:hnsw-iterative-*`; see
[[metabase.search.config/hnsw-index-backed-strategies]], [[create-index-table-if-not-exists!]], and the
- async build triggered by [[metabase-enterprise.semantic-search.settings/semantic-search-vector-strategy]]).
+ async build triggered by [[metabase-enterprise.search.semantic.settings/semantic-search-vector-strategy]]).
Pass `concurrently? true` to build with `CREATE INDEX CONCURRENTLY` (for a populated table whose writes
shouldn't be locked out); it must run outside a transaction."
@@ -1403,7 +1403,7 @@
model-ids))
(comment
- (def pgvector ((requiring-resolve 'metabase-enterprise.semantic-search.env/get-pgvector-datasource!)))
+ (def pgvector ((requiring-resolve 'metabase-enterprise.search.semantic.env/get-pgvector-datasource!)))
(def embedding-model (embedding/get-configured-model))
(def index (default-index embedding-model))
(create-index-table-if-not-exists! pgvector index {:force-reset? true})
@@ -1430,8 +1430,8 @@
explain-sql (str "EXPLAIN (ANALYZE true, BUFFERS true, FORMAT text) " sql)]
(jdbc/execute! db (into [explain-sql] params))))
- ((requiring-resolve 'metabase-enterprise.semantic-search.db.datasource/init-db!))
- (def db @@(requiring-resolve 'metabase-enterprise.semantic-search.db.datasource/data-source))
+ ((requiring-resolve 'metabase-enterprise.search.semantic.db.datasource/init-db!))
+ (def db @@(requiring-resolve 'metabase-enterprise.search.semantic.db.datasource/data-source))
(jdbc/execute! db ["SHOW random_page_cost;"]) ; makes index scans appear cheaper
(jdbc/execute! db ["SHOW seq_page_cost;"]) ; default 1
(jdbc/execute! db ["SHOW hnsw.ef_search;"])
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/index_metadata.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/index_metadata.clj
similarity index 96%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/index_metadata.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/index_metadata.clj
index 91bd6f8b379..f131067aba9 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/index_metadata.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/index_metadata.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.index-metadata
+(ns metabase-enterprise.search.semantic.index-metadata
"Multi-index management for pgvector semantic search.
Tracks multiple embedding model indexes through metadata tables, supporting model switching
@@ -8,10 +8,10 @@
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
;; TODO: extract schema code to go under db.migration
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.util :as semantic.util]
- [metabase.embeddings.provider :as embeddings.provider]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.util :as u]
[metabase.util.log :as log]
[next.jdbc :as jdbc]
@@ -96,10 +96,10 @@
(def app-db-index-metadata
"The index metadata configuration used when semantic search shares the application database.
Every table lives inside a dedicated schema, so destructive maintenance (see
- [[metabase-enterprise.semantic-search.db.migration.impl]]) is structurally incapable of touching
+ [[metabase-enterprise.search.semantic.db.migration.impl]]) is structurally incapable of touching
application tables.
Table names are stored and threaded around schema-qualified; derive identifiers and query catalogs via
- [[metabase-enterprise.semantic-search.util/table-name-part]]."
+ [[metabase-enterprise.search.semantic.util/table-name-part]]."
;; HoneySQL renders the dotted keywords as schema-qualified identifiers, quoted or not.
(let [schema semantic.db.datasource/app-db-schema]
{:version "3"
@@ -398,9 +398,9 @@
id))
(comment
- (def pgvector ((requiring-resolve 'metabase-enterprise.semantic-search.env/get-pgvector-datasource!)))
- (def index-metadata ((requiring-resolve 'metabase-enterprise.semantic-search.env/get-index-metadata)))
- (def embedding-model ((requiring-resolve 'metabase-enterprise.semantic-search.env/get-configured-embedding-model)))
+ (def pgvector ((requiring-resolve 'metabase-enterprise.search.semantic.env/get-pgvector-datasource!)))
+ (def index-metadata ((requiring-resolve 'metabase-enterprise.search.semantic.env/get-index-metadata)))
+ (def embedding-model ((requiring-resolve 'metabase-enterprise.search.semantic.env/get-configured-embedding-model)))
(create-tables-if-not-exists! pgvector index-metadata)
(ensure-control-row-exists! pgvector index-metadata)
(drop-tables-if-exists! pgvector index-metadata)
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/indexer.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/indexer.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/indexer.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/indexer.clj
index 6619b52824a..9258b8419e6 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/indexer.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/indexer.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.indexer
+(ns metabase-enterprise.search.semantic.indexer
"Companion to the gate lib defining an indexing loop to be invoked as a singleton Quartz job.
- A (cluster singleton) interruptible quartz job should invoke (quartz-job-run!) (see task/indexer.clj).
@@ -21,11 +21,11 @@
- Progress its watermark regardless (to avoid indexer stalls if e.g. documents are poisoned)."
(:require
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.gate :as semantic.gate]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.gate :as semantic.gate]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
[metabase.analytics-interface.core :as analytics]
[metabase.util :as u]
[metabase.util.log :as log]
diff --git a/enterprise/backend/src/metabase_enterprise/search/semantic/init.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/init.clj
new file mode 100644
index 00000000000..f6b9684933c
--- /dev/null
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/init.clj
@@ -0,0 +1,12 @@
+(ns metabase-enterprise.search.semantic.init
+ (:require
+ [metabase-enterprise.search.semantic.db.store-health]
+ [metabase-enterprise.search.semantic.embedding-health]
+ [metabase-enterprise.search.semantic.events]
+ [metabase-enterprise.search.semantic.health]
+ [metabase-enterprise.search.semantic.settings]
+ [metabase-enterprise.search.semantic.task.index-cleanup]
+ [metabase-enterprise.search.semantic.task.index-repair]
+ [metabase-enterprise.search.semantic.task.indexer]
+ [metabase-enterprise.search.semantic.task.metric-collector]
+ [metabase-enterprise.search.semantic.task.usage-trimmer]))
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/models/token_tracking.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/models/token_tracking.clj
similarity index 84%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/models/token_tracking.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/models/token_tracking.clj
index 46b228f86c4..a3e3b84877c 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/models/token_tracking.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/models/token_tracking.clj
@@ -1,6 +1,6 @@
-(ns metabase-enterprise.semantic-search.models.token-tracking
+(ns metabase-enterprise.search.semantic.models.token-tracking
(:require
- [metabase-enterprise.semantic-search.db :as semantic-search.db]
+ [metabase-enterprise.search.semantic.db :as semantic-search.db]
[metabase.models.interface :as mi]
[methodical.core :as methodical]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/pgvector_api.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/pgvector_api.clj
similarity index 93%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/pgvector_api.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/pgvector_api.clj
index 357b5b4b398..063ac05e2df 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/pgvector_api.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/pgvector_api.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.pgvector-api
+(ns metabase-enterprise.search.semantic.pgvector-api
"High-level API for pgvector based semantic search over metabase.search documents.
Provides the primary interface for search, indexing, and document management.
@@ -8,16 +8,16 @@
Important: The pgvector database must be setup for metadata by calling (init-semantic-search!)
After this, the document management and query functions will work as long as you pass the same index-metadata configuration."
(:require
- [metabase-enterprise.semantic-search.db.connection :as semantic.db.connection]
- [metabase-enterprise.semantic-search.db.migration :as semantic.db.migration]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.gate :as semantic.gate]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.repair :as semantic.repair]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.db.connection :as semantic.db.connection]
+ [metabase-enterprise.search.semantic.db.migration :as semantic.db.migration]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.gate :as semantic.gate]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.repair :as semantic.repair]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.util.log :as log]
[next.jdbc :as jdbc])
(:import
@@ -27,7 +27,7 @@
(set! *warn-on-reflection* true)
(comment
- (require '[metabase-enterprise.semantic-search.db.datasource :as semantic.db])
+ (require '[metabase-enterprise.search.semantic.db.datasource :as semantic.db])
(def pgvector (or @semantic.db/data-source (semantic.db/init-db!)))
(def index-metadata semantic.index-metadata/default-index-metadata)
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/repair.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/repair.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/repair.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/repair.clj
index 178a4e94647..e0086ccdad3 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/repair.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/repair.clj
@@ -1,7 +1,7 @@
-(ns metabase-enterprise.semantic-search.repair
+(ns metabase-enterprise.search.semantic.repair
"Index repair functionality for detecting and fixing lost deletes in semantic search.
- When `metabase-enterprise.semantic-search.core/repair-index!` is called with the full set of documents
+ When `metabase-enterprise.search.semantic.core/repair-index!` is called with the full set of documents
that should be in the index, we re-gate new and updated documents, and also populate a temporary repair table
with the model/model_id pairs of all provided documents. We use this repair table to do an anti-join against
the gate table to find lost deletes that we issue tombstones for."
@@ -11,7 +11,7 @@
[honey.sql.helpers :as sql.helpers]
[java-time.api :as t]
[medley.core :as m]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.util :as u]
[metabase.util.log :as log]
[metabase.util.string :as u.str]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/schema.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/schema.clj
similarity index 94%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/schema.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/schema.clj
index f995f7dfe1f..e02066c47f9 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/schema.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/schema.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.schema
+(ns metabase-enterprise.search.semantic.schema
"Malli schemas for the semantic-search module."
(:require
[metabase.util.malli.registry :as mr]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/scoring.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/scoring.clj
similarity index 96%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/scoring.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/scoring.clj
index 777a2641836..3e5e501ce8e 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/scoring.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/scoring.clj
@@ -1,12 +1,12 @@
-(ns metabase-enterprise.semantic-search.scoring
+(ns metabase-enterprise.search.semantic.scoring
(:require
[clojure.core.memoize :as memoize]
[clojure.set :as set]
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
[medley.core :as m]
- [metabase-enterprise.semantic-search.db :as semantic-search.db]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.db :as semantic-search.db]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
[metabase.activity-feed.core :as activity-feed]
[metabase.config.core :as config]
[metabase.premium-features.core :as premium-features]
@@ -147,8 +147,8 @@
(search.scoring/all-scores weights scorers index-row))
(comment
- (def embedding-model ((requiring-resolve 'metabase-enterprise.semantic-search.embedding/get-configured-model)))
- (def index ((requiring-resolve 'metabase-enterprise.semantic-search.index/default-index) embedding-model))
+ (def embedding-model ((requiring-resolve 'metabase-enterprise.search.semantic.embedding/get-configured-model)))
+ (def index ((requiring-resolve 'metabase-enterprise.search.semantic.index/default-index) embedding-model))
(def index-table (:table-name index)))
;;
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/settings.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/settings.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/settings.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/settings.clj
index f4127bc9502..c034b2044f9 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/settings.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/settings.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.settings
+(ns metabase-enterprise.search.semantic.settings
(:require
[clojure.string :as str]
[metabase.events.core :as events]
@@ -8,7 +8,7 @@
[metabase.settings.core :as setting :refer [defsetting]]
[metabase.util.i18n :refer [deferred-tru tru]]))
-;; Topic for the just-in-time HNSW build, handled in metabase-enterprise.semantic-search.events. Declared
+;; Topic for the just-in-time HNSW build, handled in metabase-enterprise.search.semantic.events. Declared
;; here, not there, so it's valid wherever the setter runs regardless of handler-namespace load order.
(events/derive! :event/semantic-search-hnsw-enabled :metabase/event)
@@ -229,7 +229,7 @@
(defsetting ee-search-gate-write-timeout
(str "Timeout of gate write statements in seconds. Used to determine lag tolerance of the indexer (see the "
- "[[metabase-enterprise.semantic-search.gate/poll]]) in conjunction "
+ "[[metabase-enterprise.search.semantic.gate/poll]]) in conjunction "
"with `ee-search-indexer-lag-tolerance-multiplier`.")
:type :integer
:default 5
@@ -270,7 +270,7 @@
:doc false)
(defsetting ee-search-indexer-lag-tolerance-multiplier
- (str "Multiplier for computation of [[metabase-enterprise.semantic-search.indexer/lag-tolerance]]. The formula "
+ (str "Multiplier for computation of [[metabase-enterprise.search.semantic.indexer/lag-tolerance]]. The formula "
"is `ee-search-gate-write-timeout * ee-search-indexer-lag-tolerance-multiplier`.")
:type :integer
:default 2
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/task/index_cleanup.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/task/index_cleanup.clj
similarity index 97%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/task/index_cleanup.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/task/index_cleanup.clj
index 36723c331a4..160db5731fb 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/task/index_cleanup.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/task/index_cleanup.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.task.index-cleanup
+(ns metabase-enterprise.search.semantic.task.index-cleanup
"Task to clean up inactive and stale semantic search indexes."
(:require
[clojure.string :as str]
@@ -8,11 +8,11 @@
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
[java-time.api :as t]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.task.core :as task]
[metabase.util.log :as log]
[next.jdbc :as jdbc]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/task/index_repair.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/task/index_repair.clj
similarity index 90%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/task/index_repair.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/task/index_repair.clj
index 9fe5d5e03f8..52fe648692d 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/task/index_repair.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/task/index_repair.clj
@@ -1,12 +1,12 @@
-(ns metabase-enterprise.semantic-search.task.index-repair
+(ns metabase-enterprise.search.semantic.task.index-repair
"Task to run repair-index! hourly for semantic search maintenance."
(:require
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.cron :as cron]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase-enterprise.semantic-search.core :as semantic-search.core]
- [metabase-enterprise.semantic-search.health :as semantic.health]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.core :as semantic-search.core]
+ [metabase-enterprise.search.semantic.health :as semantic.health]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.lib-be.core :as lib-be]
[metabase.search.ingestion :as search.ingestion]
[metabase.task.core :as task]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/task/indexer.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/task/indexer.clj
similarity index 90%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/task/indexer.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/task/indexer.clj
index 9beba1ccf9c..796ba8804b6 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/task/indexer.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/task/indexer.clj
@@ -1,15 +1,15 @@
-(ns metabase-enterprise.semantic-search.task.indexer
+(ns metabase-enterprise.search.semantic.task.indexer
(:require
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.simple :as simple]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase-enterprise.semantic-search.core :as semantic.core]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.indexer :as semantic-search.indexer]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.core :as semantic.core]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.indexer :as semantic-search.indexer]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.search.config :as search.config]
[metabase.search.core :as search]
[metabase.task.core :as task]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/task/metric_collector.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/task/metric_collector.clj
similarity index 94%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/task/metric_collector.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/task/metric_collector.clj
index 32117881694..065031f3588 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/task/metric_collector.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/task/metric_collector.clj
@@ -1,13 +1,13 @@
-(ns metabase-enterprise.semantic-search.task.metric-collector
+(ns metabase-enterprise.search.semantic.task.metric-collector
(:require
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.simple :as simple]
[clojurewerkz.quartzite.triggers :as triggers]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.datasource]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.datasource]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.analytics-interface.core :as analytics]
[metabase.search.index-health :as search.index-health]
[metabase.task.core :as task]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/task/usage_trimmer.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/task/usage_trimmer.clj
similarity index 90%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/task/usage_trimmer.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/task/usage_trimmer.clj
index fa64d609629..66f5aa8d34b 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/task/usage_trimmer.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/task/usage_trimmer.clj
@@ -1,10 +1,10 @@
-(ns metabase-enterprise.semantic-search.task.usage-trimmer
+(ns metabase-enterprise.search.semantic.task.usage-trimmer
(:require
[clojurewerkz.quartzite.jobs :as jobs]
[clojurewerkz.quartzite.schedule.cron :as cron]
[clojurewerkz.quartzite.triggers :as triggers]
- [metabase-enterprise.semantic-search.db :as semantic-search.db]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.db :as semantic-search.db]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.task.core :as task]
[metabase.util.log :as log])
(:import
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/util.clj b/enterprise/backend/src/metabase_enterprise/search/semantic/util.clj
similarity index 98%
rename from enterprise/backend/src/metabase_enterprise/semantic_search/util.clj
rename to enterprise/backend/src/metabase_enterprise/search/semantic/util.clj
index ec817521d2a..042fb66d7d8 100644
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/util.clj
+++ b/enterprise/backend/src/metabase_enterprise/search/semantic/util.clj
@@ -1,7 +1,7 @@
-(ns metabase-enterprise.semantic-search.util
+(ns metabase-enterprise.search.semantic.util
(:require
[clojure.string :as str]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
[metabase.app-db.core :as mdb]
[metabase.premium-features.core :as premium-features]
[metabase.search.engine :as search.engine]
diff --git a/enterprise/backend/src/metabase_enterprise/semantic_search/init.clj b/enterprise/backend/src/metabase_enterprise/semantic_search/init.clj
deleted file mode 100644
index 412f2788e63..00000000000
--- a/enterprise/backend/src/metabase_enterprise/semantic_search/init.clj
+++ /dev/null
@@ -1,12 +0,0 @@
-(ns metabase-enterprise.semantic-search.init
- (:require
- [metabase-enterprise.semantic-search.db.store-health]
- [metabase-enterprise.semantic-search.embedding-health]
- [metabase-enterprise.semantic-search.events]
- [metabase-enterprise.semantic-search.health]
- [metabase-enterprise.semantic-search.settings]
- [metabase-enterprise.semantic-search.task.index-cleanup]
- [metabase-enterprise.semantic-search.task.index-repair]
- [metabase-enterprise.semantic-search.task.indexer]
- [metabase-enterprise.semantic-search.task.metric-collector]
- [metabase-enterprise.semantic-search.task.usage-trimmer]))
diff --git a/enterprise/backend/test/metabase_enterprise/cloud_add_ons/api_test.clj b/enterprise/backend/test/metabase_enterprise/cloud_add_ons/api_test.clj
index 3149114e9f7..a74da6b117f 100644
--- a/enterprise/backend/test/metabase_enterprise/cloud_add_ons/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/cloud_add_ons/api_test.clj
@@ -3,7 +3,7 @@
[clj-http.client :as http]
[clojure.test :refer :all]
[metabase-enterprise.harbormaster.client :as hm.client]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.premium-features.core :as premium-features]
[metabase.test :as mt]))
diff --git a/enterprise/backend/test/metabase_enterprise/data_complexity_score/cli_test.clj b/enterprise/backend/test/metabase_enterprise/data_complexity_score/cli_test.clj
index ce8c661aa0c..aebaf862a23 100644
--- a/enterprise/backend/test/metabase_enterprise/data_complexity_score/cli_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_complexity_score/cli_test.clj
@@ -11,7 +11,7 @@
[metabase-enterprise.data-complexity-score.synonym-source :as synonym-source]
[metabase-enterprise.data-complexity-score.task.complexity-score :as task.complexity-score]
[metabase.app-db.core :as mdb]
- [metabase.embeddings.startup :as embeddings.startup]
+ [metabase.search.embeddings.startup :as embeddings.startup]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.json :as json]))
diff --git a/enterprise/backend/test/metabase_enterprise/data_complexity_score/complexity_test.clj b/enterprise/backend/test/metabase_enterprise/data_complexity_score/complexity_test.clj
index 2a1dd598161..80261ed65fe 100644
--- a/enterprise/backend/test/metabase_enterprise/data_complexity_score/complexity_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_complexity_score/complexity_test.clj
@@ -13,17 +13,17 @@
[metabase-enterprise.data-complexity-score.synonym-source :as synonym-source]
[metabase-enterprise.data-complexity-score.task.complexity-score :as task.complexity-score]
[metabase-enterprise.data-complexity-score.test-util :as test-util]
- [metabase-enterprise.embeddings.client :as embeddings]
- [metabase-enterprise.semantic-search.core :as semantic-search]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.embedders :as ss.embedders]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.embeddings.client :as embeddings]
+ [metabase-enterprise.search.semantic.core :as semantic-search]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.embedders :as ss.embedders]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.analytics.core :as analytics]
[metabase.analytics.snowplow-test :as snowplow-test]
[metabase.audit-app.core :as audit]
[metabase.collections.core :as collections]
[metabase.collections.test-utils :as collections.tu]
- [metabase.embeddings.provider :as embeddings.provider]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.task.core :as task]
[metabase.test :as mt]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj b/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj
index e10766d3215..b8a33476382 100644
--- a/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/metabot/tools/semantic_search_test.clj
@@ -2,7 +2,7 @@
"Semantic search tests specific to the Metabot search tool integration."
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.metabot.tools.search :as search]
[metabase.permissions.core :as perms]
[metabase.search.core :as search-core]
@@ -149,7 +149,7 @@
:model/Dashboard {id-3 :id} {:name "baseline"}]
(when semantic-support?
(semantic.tu/index-all!))
- (let [test-entity? (comp #{id-1 id-2 id-3} :id)
+ (let [test-entity? (every-pred (comp #{"dashboard"} :type) (comp #{id-1 id-2 id-3} :id))
query (fn [base-query]
(->> (search/search base-query)
(filter test-entity?)
@@ -176,7 +176,7 @@
:model/Dashboard {id-5 :id} {:name "quixotic"}
:model/Dashboard {id-6 :id} {:name "baseline"}]
(semantic.tu/index-all!)
- (let [test-entity? (comp #{id-1 id-2 id-3 id-4 id-5 id-6} :id)
+ (let [test-entity? (every-pred (comp #{"dashboard"} :type) (comp #{id-1 id-2 id-3 id-4 id-5 id-6} :id))
query (fn [base-query]
(->> (search/search base-query)
(filter test-entity?)
diff --git a/enterprise/backend/test/metabase_enterprise/embeddings/client_test.clj b/enterprise/backend/test/metabase_enterprise/search/embeddings/client_test.clj
similarity index 90%
rename from enterprise/backend/test/metabase_enterprise/embeddings/client_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/embeddings/client_test.clj
index d4f2e725a5b..98b7ad197ff 100644
--- a/enterprise/backend/test/metabase_enterprise/embeddings/client_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/embeddings/client_test.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.embeddings.client-test
+(ns metabase-enterprise.search.embeddings.client-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.embeddings.client :as embeddings.client]
- [metabase-enterprise.semantic-search.core :as semantic-search]
+ [metabase-enterprise.search.embeddings.client :as embeddings.client]
+ [metabase-enterprise.search.semantic.core :as semantic-search]
[metabase.test :as mt]))
(set! *warn-on-reflection* true)
diff --git a/enterprise/backend/test/metabase_enterprise/entity_retrieval/appdb_mode_test.clj b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/appdb_mode_test.clj
similarity index 92%
rename from enterprise/backend/test/metabase_enterprise/entity_retrieval/appdb_mode_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/entity_retrieval/appdb_mode_test.clj
index a12d09b95b2..0c6d5e42683 100644
--- a/enterprise/backend/test/metabase_enterprise/entity_retrieval/appdb_mode_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/appdb_mode_test.clj
@@ -1,22 +1,22 @@
-(ns metabase-enterprise.entity-retrieval.appdb-mode-test
+(ns metabase-enterprise.search.entity-retrieval.appdb-mode-test
"End-to-end round trip for the library entity index on pgvector-on-the-app-db: no MB_PGVECTOR_DB_URL,
every table inside the library_retrieval schema, sharing the app-db pool.
- Opt-in and self-gated like [[metabase-enterprise.semantic-search.appdb-pgvector-mode-test]]: the round
+ Opt-in and self-gated like [[metabase-enterprise.search.semantic.appdb-pgvector-mode-test]]: the round
trip installs the vector extension and drops the library_retrieval schema on cleanup, so it runs only
with MB_APPDB_PGVECTOR_MODE_TEST=true, set by the appdb-mode CI job.
No test-util once-fixture: that gates on the dedicated-harness MB_PGVECTOR_DB_URL, which is what this
namespace runs without."
(:require
[clojure.test :refer [deftest is testing use-fixtures]]
- [metabase-enterprise.entity-retrieval.core :as entity-retrieval.core]
- [metabase-enterprise.entity-retrieval.index-table :as index-table]
- [metabase-enterprise.entity-retrieval.reconcile :as reconcile]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.db.migration.impl :as semantic.migration.impl]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.entity-retrieval.core :as entity-retrieval.core]
+ [metabase-enterprise.search.entity-retrieval.index-table :as index-table]
+ [metabase-enterprise.search.entity-retrieval.reconcile :as reconcile]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.db.migration.impl :as semantic.migration.impl]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.app-db.core :as mdb]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
diff --git a/enterprise/backend/test/metabase_enterprise/entity_retrieval/core_test.clj b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/core_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/entity_retrieval/core_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/entity_retrieval/core_test.clj
index a8ae34519e7..3c9f6248183 100644
--- a/enterprise/backend/test/metabase_enterprise/entity_retrieval/core_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/core_test.clj
@@ -1,15 +1,15 @@
-(ns metabase-enterprise.entity-retrieval.core-test
+(ns metabase-enterprise.search.entity-retrieval.core-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.entity-retrieval.core :as entity-retrieval.core]
- [metabase-enterprise.entity-retrieval.index-table :as index-table]
- [metabase-enterprise.entity-retrieval.reconcile :as reconcile]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.embedding-health :as embedding-health]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase.entity-retrieval.mirror :as mirror]
+ [metabase-enterprise.search.entity-retrieval.core :as entity-retrieval.core]
+ [metabase-enterprise.search.entity-retrieval.index-table :as index-table]
+ [metabase-enterprise.search.entity-retrieval.reconcile :as reconcile]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.embedding-health :as embedding-health]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.metabot.tools.entity-retrieval :as tools.entity-retrieval]
+ [metabase.search.entity-retrieval.mirror :as mirror]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[next.jdbc :as jdbc]))
@@ -547,7 +547,7 @@
(constantly (semantic.tu/resolved-mock-embedding-model
:vector-dimensions 1))
index-table/index-status (constantly :compatible)]
- (mt/with-log-messages-for-level [messages [metabase-enterprise.entity-retrieval.core :warn]]
+ (mt/with-log-messages-for-level [messages [metabase-enterprise.search.entity-retrieval.core :warn]]
(is (= [] (entity-retrieval.core/search-unfiltered "q" 10)))
(is (=? [{:level :warn
:message #"(?s)library entity index incompatible with the query vector.*"}]
diff --git a/enterprise/backend/test/metabase_enterprise/entity_retrieval/health_test.clj b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/health_test.clj
similarity index 94%
rename from enterprise/backend/test/metabase_enterprise/entity_retrieval/health_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/entity_retrieval/health_test.clj
index 80c59e1d50f..f3fae31ccfb 100644
--- a/enterprise/backend/test/metabase_enterprise/entity_retrieval/health_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/health_test.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.entity-retrieval.health-test
+(ns metabase-enterprise.search.entity-retrieval.health-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.entity-retrieval.core :as entity-retrieval.core]
- [metabase-enterprise.entity-retrieval.health :as entity-retrieval.health]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.datasource]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.embedding-health :as embedding-health]
+ [metabase-enterprise.search.entity-retrieval.core :as entity-retrieval.core]
+ [metabase-enterprise.search.entity-retrieval.health :as entity-retrieval.health]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.datasource]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.embedding-health :as embedding-health]
[metabase.test :as mt]
[next.jdbc :as jdbc]))
diff --git a/enterprise/backend/test/metabase_enterprise/entity_retrieval/index_table_test.clj b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/index_table_test.clj
similarity index 95%
rename from enterprise/backend/test/metabase_enterprise/entity_retrieval/index_table_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/entity_retrieval/index_table_test.clj
index 56ffee646fb..a14338249ce 100644
--- a/enterprise/backend/test/metabase_enterprise/entity_retrieval/index_table_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/index_table_test.clj
@@ -1,10 +1,10 @@
-(ns metabase-enterprise.entity-retrieval.index-table-test
+(ns metabase-enterprise.search.entity-retrieval.index-table-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.entity-retrieval.index-table :as index-table]
- [metabase-enterprise.entity-retrieval.reconcile :as reconcile]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.entity-retrieval.index-table :as index-table]
+ [metabase-enterprise.search.entity-retrieval.reconcile :as reconcile]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.test :as mt]
[metabase.util.log.capture :as log.capture]
[next.jdbc :as jdbc]
@@ -12,7 +12,7 @@
(deftest legacy-meta-table-without-ownership-test
(testing "a grant-only role neither attempts ALTER nor repeatedly warns"
- (log.capture/with-log-messages-for-level [messages [metabase-enterprise.entity-retrieval.index-table :warn]]
+ (log.capture/with-log-messages-for-level [messages [metabase-enterprise.search.entity-retrieval.index-table :warn]]
(let [executed (atom [])]
(with-redefs-fn {#'index-table/meta-column-exists? (constantly false)
#'index-table/can-alter-meta-table? (constantly false)
diff --git a/enterprise/backend/test/metabase_enterprise/entity_retrieval/reconcile_test.clj b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/reconcile_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/entity_retrieval/reconcile_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/entity_retrieval/reconcile_test.clj
index ae701e54a98..049b164f9c7 100644
--- a/enterprise/backend/test/metabase_enterprise/entity_retrieval/reconcile_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/entity_retrieval/reconcile_test.clj
@@ -1,14 +1,14 @@
-(ns metabase-enterprise.entity-retrieval.reconcile-test
+(ns metabase-enterprise.search.entity-retrieval.reconcile-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.entity-retrieval.index-table :as index-table]
- [metabase-enterprise.entity-retrieval.reconcile :as reconcile]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.entity-retrieval.index-table :as index-table]
+ [metabase-enterprise.search.entity-retrieval.reconcile :as reconcile]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.collections.test-utils :as collections.tu]
- [metabase.entity-retrieval.mirror :as mirror]
[metabase.measures.test-util :as measures.tu]
[metabase.metabot.tools.search :as tools.search]
+ [metabase.search.entity-retrieval.mirror :as mirror]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[next.jdbc :as jdbc]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/api_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/api_test.clj
similarity index 92%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/api_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/api_test.clj
index 133d1e3e221..c6bdbad762d 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/api_test.clj
@@ -1,13 +1,13 @@
-(ns metabase-enterprise.semantic-search.api-test
+(ns metabase-enterprise.search.semantic.api-test
(:require
[clojure.core.memoize :as memoize]
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.api :as semantic.api]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.api :as semantic.api]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.search.ingestion :as search.ingestion]
[metabase.test :as mt]))
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/appdb_pgvector_mode_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/appdb_pgvector_mode_test.clj
similarity index 94%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/appdb_pgvector_mode_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/appdb_pgvector_mode_test.clj
index cda9fcd43f2..50b54f19610 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/appdb_pgvector_mode_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/appdb_pgvector_mode_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.appdb-pgvector-mode-test
+(ns metabase-enterprise.search.semantic.appdb-pgvector-mode-test
"End-to-end round trip for pgvector-on-the-app-db mode: no MB_PGVECTOR_DB_URL, semantic search runs
against the application database inside the semantic_search schema, sharing the app-db pool.
@@ -10,17 +10,17 @@
(:require
[clojure.string :as str]
[clojure.test :refer [deftest is testing use-fixtures]]
- [metabase-enterprise.semantic-search.core :as semantic.core]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.core :as semantic.core]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.app-db.core :as mdb]
- [metabase.embeddings.provider :as embeddings.provider]
- [metabase.embeddings.startup :as embeddings.startup]
+ [metabase.search.embeddings.provider :as embeddings.provider]
+ [metabase.search.embeddings.startup :as embeddings.startup]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
[next.jdbc :as jdbc]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/core_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/core_test.clj
similarity index 97%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/core_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/core_test.clj
index 92e6b70f91c..d0c3bcdda70 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/core_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/core_test.clj
@@ -1,14 +1,14 @@
-(ns metabase-enterprise.semantic-search.core-test
+(ns metabase-enterprise.search.semantic.core-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.core :as semantic.core]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.repair :as semantic.repair]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.core :as semantic.core]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.repair :as semantic.repair]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.analytics-interface.core :as analytics]
[metabase.app-db.core :as mdb]
[metabase.search.appdb.core :as appdb]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/db/datasource_mode_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/db/datasource_mode_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/db/datasource_mode_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/db/datasource_mode_test.clj
index c966d25e37e..4aa1420125c 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/db/datasource_mode_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/db/datasource_mode_test.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.semantic-search.db.datasource-mode-test
+(ns metabase-enterprise.search.semantic.db.datasource-mode-test
"Unit tests (redefs only, no databases) for pgvector mode selection: dedicated URL vs. shared app-db vs.
unavailable. The end-to-end app-db mode round-trip lives in
- metabase-enterprise.semantic-search.appdb-pgvector-mode-test."
+ metabase-enterprise.search.semantic.appdb-pgvector-mode-test."
(:require
[clojure.test :refer [deftest is testing]]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.app-db.core :as mdb]
[metabase.test :as mt]
[next.jdbc :as jdbc])
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/db/store_health_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/db/store_health_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/db/store_health_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/db/store_health_test.clj
index bd10ba88989..720baedb97b 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/db/store_health_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/db/store_health_test.clj
@@ -1,12 +1,12 @@
-(ns metabase-enterprise.semantic-search.db.store-health-test
+(ns metabase-enterprise.search.semantic.db.store-health-test
(:require
[clojure.string :as str]
[clojure.test :refer [deftest is testing]]
[iapetos.export :as export]
[java-time.api :as t]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.db.store-health :as semantic.store-health]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.db.store-health :as semantic.store-health]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.analytics-interface.core :as analytics]
[metabase.analytics.core :as analytics.core]
[metabase.app-db.core :as mdb]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/db_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/db_test.clj
similarity index 99%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/db_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/db_test.clj
index 4ea2aa893b5..725b9e57c9c 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/db_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/db_test.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.semantic-search.db-test
+(ns metabase-enterprise.search.semantic.db-test
(:require
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource])
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource])
(:import
(com.mchange.v2.c3p0 PoolBackedDataSource PooledDataSource)
(java.sql SQLException SQLTimeoutException)
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/debug_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/debug_test.clj
similarity index 92%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/debug_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/debug_test.clj
index b4cec95dc15..2ae58f6ec83 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/debug_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/debug_test.clj
@@ -1,12 +1,12 @@
-(ns metabase-enterprise.semantic-search.debug-test
+(ns metabase-enterprise.search.semantic.debug-test
"Engine-owned diagnostic stages for the semantic search index. Mirrors the appdb coverage in
[[metabase.search.debug-test]], but exercises [[semantic.index/diagnose-row]] directly against the
mock-indexed pgvector test database (gated on MB_PGVECTOR_DB_URL via [[semantic.tu/once-fixture]])."
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.test :as mt]
[toucan2.core :as t2]))
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/dlq_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/dlq_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/dlq_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/dlq_test.clj
index f94799a2fb2..bdd5c3007bd 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/dlq_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/dlq_test.clj
@@ -1,13 +1,13 @@
-(ns metabase-enterprise.semantic-search.dlq-test
+(ns metabase-enterprise.search.semantic.dlq-test
(:require
[clojure.test :refer :all]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.gate :as semantic.gate]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.gate :as semantic.gate]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.llm.settings :as llm.settings]
[metabase.test :as mt]
[metabase.util.json :as json]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/embedding_circuit_breaker_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/embedding_circuit_breaker_test.clj
similarity index 97%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/embedding_circuit_breaker_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/embedding_circuit_breaker_test.clj
index 229965ee1b6..75b9421ff75 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/embedding_circuit_breaker_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/embedding_circuit_breaker_test.clj
@@ -1,16 +1,16 @@
-(ns metabase-enterprise.semantic-search.embedding-circuit-breaker-test
+(ns metabase-enterprise.search.semantic.embedding-circuit-breaker-test
(:require
[clj-http.client :as http]
[clojure.test :refer :all]
[diehard.circuit-breaker :as dh.cb]
;; loaded for side effects: the health namespaces register the breaker state-change hooks that
;; state-change-persists-affected-checks-test exercises
- [metabase-enterprise.entity-retrieval.health]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.embedding-health :as embedding-health]
- [metabase-enterprise.semantic-search.health]
- [metabase-enterprise.semantic-search.models.token-tracking :as token-tracking]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
+ [metabase-enterprise.search.entity-retrieval.health]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.embedding-health :as embedding-health]
+ [metabase-enterprise.search.semantic.health]
+ [metabase-enterprise.search.semantic.models.token-tracking :as token-tracking]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
[metabase.analytics-interface.core :as analytics]
[metabase.health-inspector.core :as health-inspector]
[metabase.llm.provider :as llm.provider]
@@ -131,7 +131,7 @@
(atom {test-endpoint (dh.cb/circuit-breaker
{:failure-threshold 1 :success-threshold 1 :delay-ms 60000})})]
(is (thrown? Exception (call-through boom)))
- (mt/with-log-messages-for-level [messages [metabase-enterprise.semantic-search.embedding :error]]
+ (mt/with-log-messages-for-level [messages [metabase-enterprise.search.semantic.embedding :error]]
(is (=? {:cause :embedder/circuit-open :status 502}
(try
(openai-compatible-get-embeddings-batch*
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/embedding_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/embedding_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/embedding_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/embedding_test.clj
index abc2a38f088..642f2390d48 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/embedding_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/embedding_test.clj
@@ -1,26 +1,26 @@
-(ns metabase-enterprise.semantic-search.embedding-test
+(ns metabase-enterprise.search.semantic.embedding-test
(:require
[clj-http.client :as http]
[clojure.test :refer :all]
[environ.core :as env]
- [metabase-enterprise.semantic-search.embedding :as embedding]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.gate :as semantic.gate]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.indexer :as semantic.indexer]
- [metabase-enterprise.semantic-search.models.token-tracking :as semantic.models.token-tracking]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.embedding :as embedding]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.gate :as semantic.gate]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.indexer :as semantic.indexer]
+ [metabase-enterprise.search.semantic.models.token-tracking :as semantic.models.token-tracking]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.analytics-interface.core :as analytics]
[metabase.analytics.snowplow-test :as snowplow-test]
- [metabase.embeddings.provider :as embeddings.provider]
[metabase.llm.provider :as llm.provider]
[metabase.llm.settings :as llm.settings]
[metabase.llm.test-util :as llm.tu]
[metabase.permissions.core :as perms]
[metabase.premium-features.core :as premium-features]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.settings.core :as setting]
[metabase.test :as mt]
[metabase.test.fixtures :as fixtures]
@@ -236,7 +236,7 @@
(defn- encode-floats-to-base64
"Helper function to base64 encode a vector of floats using little-endian byte order.
- Inverse of [[metabase-enterprise.semantic-search.embedding/extract-base64-response-embeddings]] "
+ Inverse of [[metabase-enterprise.search.semantic.embedding/extract-base64-response-embeddings]] "
[float-vector]
(let [byte-count (* (count float-vector) 4)
buffer (doto (ByteBuffer/allocate byte-count)
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/gate_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/gate_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/gate_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/gate_test.clj
index 07ecbf07ee7..ad0f12ab3a5 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/gate_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/gate_test.clj
@@ -1,14 +1,14 @@
-(ns metabase-enterprise.semantic-search.gate-test
+(ns metabase-enterprise.search.semantic.gate-test
(:require
[buddy.core.hash :as buddy-hash]
[clojure.test :refer :all]
[clojure.walk :as walk]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.gate :as semantic.gate]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.gate :as semantic.gate]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.json :as json]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/health_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/health_test.clj
similarity index 97%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/health_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/health_test.clj
index c942528c131..f7db64f99b0 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/health_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/health_test.clj
@@ -1,17 +1,17 @@
-(ns metabase-enterprise.semantic-search.health-test
+(ns metabase-enterprise.search.semantic.health-test
(:require
[clojure.core.memoize :as memoize]
[clojure.test :refer :all]
[java-time.api :as t]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.embedding-health :as embedding-health]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.health :as semantic.health]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.embedding-health :as embedding-health]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.health :as semantic.health]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.analytics-interface.core :as analytics]
[metabase.health-inspector.core :as health-inspector]
[metabase.search.index-health :as search.index-health]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/index_embedding_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/index_embedding_test.clj
similarity index 95%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/index_embedding_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/index_embedding_test.clj
index 178c5970a0c..11febeb37a0 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/index_embedding_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/index_embedding_test.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.semantic-search.index-embedding-test
+(ns metabase-enterprise.search.semantic.index-embedding-test
"Tests for things at the intersection of the index and embedding namespaces."
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
[metabase.test :as mt]))
(def ^:private test-provider "ai-service")
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/index_metadata_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/index_metadata_test.clj
similarity index 97%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/index_metadata_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/index_metadata_test.clj
index 0c8a2f280a5..8810cf11dca 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/index_metadata_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/index_metadata_test.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.semantic-search.index-metadata-test
+(ns metabase-enterprise.search.semantic.index-metadata-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase.embeddings.provider :as embeddings.provider]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.test :as mt]
[metabase.util :as u])
(:import
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/index_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/index_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/index_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/index_test.clj
index 86079a9526d..55e62fba8d0 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/index_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/index_test.clj
@@ -1,19 +1,19 @@
-(ns metabase-enterprise.semantic-search.index-test
- {:clj-kondo/config '{:linters {:deprecated-var {:exclude {metabase.test.data/mbql-query {:namespaces [metabase-enterprise.semantic-search.index-test]}}}}}}
+(ns metabase-enterprise.search.semantic.index-test
+ {:clj-kondo/config '{:linters {:deprecated-var {:exclude {metabase.test.data/mbql-query {:namespaces [metabase-enterprise.search.semantic.index-test]}}}}}}
(:require
[clojure.string :as str]
[clojure.test :refer :all]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.core :as semantic.core]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.env :as semantic.env]
+ [metabase-enterprise.search.semantic.core :as semantic.core]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
;; loaded for its :event/semantic-search-hnsw-enabled handler, which the setter test exercises
- [metabase-enterprise.semantic-search.events]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.spec-trace-test-util :as spec-trace]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.events]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.spec-trace-test-util :as spec-trace]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.analytics-interface.core :as analytics]
[metabase.api.common :as api]
[metabase.collections.models.collection :as collection]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/indexer_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/indexer_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/indexer_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/indexer_test.clj
index 26de8c5c189..218c5542104 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/indexer_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/indexer_test.clj
@@ -1,14 +1,14 @@
-(ns metabase-enterprise.semantic-search.indexer-test
+(ns metabase-enterprise.search.semantic.indexer-test
(:require
[clojure.test :refer :all]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.gate :as semantic.gate]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.indexer :as semantic.indexer]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.gate :as semantic.gate]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.indexer :as semantic.indexer]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.test :as mt]
[metabase.test.util :as tu]
[metabase.util :as u]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/migration_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/migration_test.clj
similarity index 97%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/migration_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/migration_test.clj
index fa83987398c..b4ca250aafe 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/migration_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/migration_test.clj
@@ -1,21 +1,21 @@
-(ns metabase-enterprise.semantic-search.migration-test
+(ns metabase-enterprise.search.semantic.migration-test
(:require
[clojure.test :refer [deftest is testing use-fixtures]]
[honey.sql :as sql]
[java-time.api :as t]
[medley.core :as m]
- [metabase-enterprise.semantic-search.core :as semantic.core]
- [metabase-enterprise.semantic-search.db.connection :as semantic.db.connection]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.db.migration :as semantic.db.migration]
- [metabase-enterprise.semantic-search.db.migration.impl :as semantic.db.migration.impl]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.core :as semantic.core]
+ [metabase-enterprise.search.semantic.db.connection :as semantic.db.connection]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.db.migration :as semantic.db.migration]
+ [metabase-enterprise.search.semantic.db.migration.impl :as semantic.db.migration.impl]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.collections.models.collection :as collection]
- [metabase.embeddings.provider :as embeddings.provider]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.test :as mt]
[metabase.util :as u]
[metabase.util.log :as log]
@@ -35,7 +35,7 @@
(with-redefs [semantic.db.migration.impl/schema-version attempted-version
semantic.db.migration.impl/migrate-schema! (constantly nil)
semantic.db.migration.impl/migrate-dynamic-schema! (constantly nil)]
- (log.capture/with-log-messages-for-level [messages [metabase-enterprise.semantic-search.db.migration :info]]
+ (log.capture/with-log-messages-for-level [messages [metabase-enterprise.search.semantic.db.migration :info]]
(semantic.db.connection/with-migrate-tx [tx]
(semantic.db.migration/maybe-migrate! tx {:index-metadata semantic.index-metadata/default-index-metadata})
{:messages (messages)
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/pgvector_api_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/pgvector_api_test.clj
similarity index 97%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/pgvector_api_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/pgvector_api_test.clj
index 7e4bcf34292..295fa39b69f 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/pgvector_api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/pgvector_api_test.clj
@@ -1,16 +1,16 @@
-(ns metabase-enterprise.semantic-search.pgvector-api-test
+(ns metabase-enterprise.search.semantic.pgvector-api-test
(:require
[clojure.test :refer :all]
[honey.sql :as sql]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.indexer :as semantic.indexer]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.indexer :as semantic.indexer]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.search.ingestion :as search.ingestion]
[metabase.test :as mt]
[metabase.util :as u]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/query_semantics_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/query_semantics_test.clj
similarity index 94%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/query_semantics_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/query_semantics_test.clj
index f7c4f08e3a4..7e7b315bdc9 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/query_semantics_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/query_semantics_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.query-semantics-test
+(ns metabase-enterprise.search.semantic.query-semantics-test
"Keyword, vector, and hybrid membership for the shared search cases.
Vectors are frozen output from the production-default embedding model, so the vector arm shows what that
@@ -8,11 +8,11 @@
[clojure.set :as set]
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.query-semantics-vectors :as vectors]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.query-semantics-vectors :as vectors]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.search.query-semantics :as fixtures]
[metabase.search.test-util :as search.tu]
[metabase.test :as mt]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/query_semantics_vectors.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/query_semantics_vectors.clj
similarity index 95%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/query_semantics_vectors.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/query_semantics_vectors.clj
index 75e691e8517..e1e1f3ed7b7 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/query_semantics_vectors.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/query_semantics_vectors.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.query-semantics-vectors
+(ns metabase-enterprise.search.semantic.query-semantics-vectors
"Frozen embedding vectors for the shared search semantics corpus.
The semantic tests read these instead of calling a model. After changing a document or query in
@@ -10,7 +10,7 @@
[clojure.edn :as edn]
[clojure.java.io :as io]
[clojure.string :as str]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
[metabase.search.ingestion :as search.ingestion]
[metabase.search.query-semantics :as fixtures]
[metabase.util.json :as json])
@@ -30,7 +30,7 @@
";; Document inputs use ingestion's `[card]\\nname: ...` embeddable-text format."
";; Values are 1024 IEEE-754 float32 components in big-endian Base64."
";; Decoding is local; no model or network access is needed by the test."
- ";; Regenerate with metabase-enterprise.semantic-search.query-semantics-vectors/freeze!."]))
+ ";; Regenerate with metabase-enterprise.search.semantic.query-semantics-vectors/freeze!."]))
(def metadata
"The model and encoding behind the frozen vectors."
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/query_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/query_test.clj
similarity index 99%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/query_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/query_test.clj
index 5a213fc0987..471fa7ffcc2 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/query_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/query_test.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.semantic-search.query-test
+(ns metabase-enterprise.search.semantic.query-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.permissions.models.data-permissions :as data-perms]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/repair_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/repair_test.clj
similarity index 94%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/repair_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/repair_test.clj
index 7251f2a8150..303ffdc2b81 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/repair_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/repair_test.clj
@@ -1,18 +1,18 @@
-(ns metabase-enterprise.semantic-search.repair-test
+(ns metabase-enterprise.search.semantic.repair-test
"Integration tests for repair-index! functionality."
(:require
[clojure.test :refer :all]
[honey.sql :as sql]
[java-time.api :as t]
- [metabase-enterprise.semantic-search.core :as semantic.core]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.repair :as semantic.repair]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.core :as semantic.core]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.repair :as semantic.repair]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.test :as mt]
[next.jdbc :as jdbc]
[next.jdbc.result-set :as jdbc.rs]))
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/scoring_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/scoring_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/scoring_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/scoring_test.clj
index fff87545591..f008a9769b2 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/scoring_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/scoring_test.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.semantic-search.scoring-test
+(ns metabase-enterprise.search.semantic.scoring-test
(:require
[clojure.core.memoize :as memoize]
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.scoring :as semantic.scoring]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.scoring :as semantic.scoring]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.search.config :as search.config]
[metabase.test :as mt])
(:import
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/spec_trace_test_util.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/spec_trace_test_util.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/spec_trace_test_util.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/spec_trace_test_util.clj
index afe77927b5d..4cc4fee01de 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/spec_trace_test_util.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/spec_trace_test_util.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.spec-trace-test-util
+(ns metabase-enterprise.search.semantic.spec-trace-test-util
"Helpers for walking `metabase.search.spec` shapes in tests — used to verify structural claims
like `:denormalized-from` against the actual join-equality graph of a spec."
(:require
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/spec_trace_test_util_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/spec_trace_test_util_test.clj
similarity index 95%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/spec_trace_test_util_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/spec_trace_test_util_test.clj
index 95ba984a554..254f87c7384 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/spec_trace_test_util_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/spec_trace_test_util_test.clj
@@ -1,7 +1,7 @@
-(ns metabase-enterprise.semantic-search.spec-trace-test-util-test
+(ns metabase-enterprise.search.semantic.spec-trace-test-util-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.spec-trace-test-util :as spec-trace]))
+ [metabase-enterprise.search.semantic.spec-trace-test-util :as spec-trace]))
;; Seed extraction (shorthand `true`, vector/`:case`/`:fields` expressions, control-keyword filtering) is
;; `search.spec/find-fields-attr`'s behavior and is tested there. These tests cover this util's own logic:
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/task/index_cleanup_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/task/index_cleanup_test.clj
similarity index 98%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/task/index_cleanup_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/task/index_cleanup_test.clj
index 766f42a5bcd..f2b7cb34ab0 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/task/index_cleanup_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/task/index_cleanup_test.clj
@@ -1,15 +1,15 @@
-(ns metabase-enterprise.semantic-search.task.index-cleanup-test
+(ns metabase-enterprise.search.semantic.task.index-cleanup-test
(:require
[clojure.test :refer :all]
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
[java-time.api :as t]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.repair :as repair]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.task.index-cleanup :as sut]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.repair :as repair]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.task.index-cleanup :as sut]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.test :as mt]
[metabase.util.json :as json]
[next.jdbc :as jdbc]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/task/index_repair_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/task/index_repair_test.clj
similarity index 85%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/task/index_repair_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/task/index_repair_test.clj
index 4873a49ddc6..cdb51183209 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/task/index_repair_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/task/index_repair_test.clj
@@ -1,10 +1,10 @@
-(ns metabase-enterprise.semantic-search.task.index-repair-test
+(ns metabase-enterprise.search.semantic.task.index-repair-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.core :as semantic-search.core]
- [metabase-enterprise.semantic-search.health :as semantic.health]
- [metabase-enterprise.semantic-search.repair :as semantic.repair]
- [metabase-enterprise.semantic-search.task.index-repair :as index-repair]
+ [metabase-enterprise.search.semantic.core :as semantic-search.core]
+ [metabase-enterprise.search.semantic.health :as semantic.health]
+ [metabase-enterprise.search.semantic.repair :as semantic.repair]
+ [metabase-enterprise.search.semantic.task.index-repair :as index-repair]
[metabase.search.ingestion :as search.ingestion]
[metabase.test :as mt]
[next.jdbc :as jdbc]))
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/task/indexer_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/task/indexer_test.clj
similarity index 79%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/task/indexer_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/task/indexer_test.clj
index c80f0209892..29d833f906e 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/task/indexer_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/task/indexer_test.clj
@@ -1,13 +1,13 @@
-(ns metabase-enterprise.semantic-search.task.indexer-test
+(ns metabase-enterprise.search.semantic.task.indexer-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.core :as semantic.core]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.indexer :as semantic.indexer]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.task.indexer :as sut]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.core :as semantic.core]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.indexer :as semantic.indexer]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.task.indexer :as sut]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.task.core :as task]
[metabase.test :as mt]))
@@ -43,8 +43,8 @@
semantic.env/get-index-metadata (constantly ::index-metadata)
semantic.index-metadata/get-active-index-state (constantly {:index {:table-name "index_1"}})
semantic.settings/semantic-search-vector-strategy (constantly :hnsw)
- semantic.core/build-hnsw-index-async! #(swap! builds inc)
- semantic.indexer/quartz-job-run! (fn [& _] (swap! runs inc))]
+ semantic.core/build-hnsw-index-async! #(swap! builds inc)
+ semantic.indexer/quartz-job-run! (fn [& _] (swap! runs inc))]
(doseq [[state expected-builds] [[nil 1] [:invalid 1] [:building 0] [:ready 0]]]
(reset! builds 0)
(mt/with-dynamic-fn-redefs [semantic.u/index-state (constantly state)]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/task/metric_collector_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/task/metric_collector_test.clj
similarity index 90%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/task/metric_collector_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/task/metric_collector_test.clj
index 21542f73510..0b52a42b247 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/task/metric_collector_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/task/metric_collector_test.clj
@@ -1,17 +1,17 @@
-(ns metabase-enterprise.semantic-search.task.metric-collector-test
+(ns metabase-enterprise.search.semantic.task.metric-collector-test
(:require
[clojure.test :refer [deftest is testing use-fixtures]]
[honey.sql :as sql]
[java-time.api :as t]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.task.metric-collector :as semantic.task.collector]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.task.metric-collector :as semantic.task.collector]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.search.index-health :as search.index-health]
[metabase.test :as mt]
[next.jdbc :as jdbc]))
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/task/usage_trimmer_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/task/usage_trimmer_test.clj
similarity index 90%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/task/usage_trimmer_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/task/usage_trimmer_test.clj
index c595529ccd7..0b544f5d733 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/task/usage_trimmer_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/task/usage_trimmer_test.clj
@@ -1,8 +1,8 @@
-(ns metabase-enterprise.semantic-search.task.usage-trimmer-test
+(ns metabase-enterprise.search.semantic.task.usage-trimmer-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.task.usage-trimmer :as semantic.task.trimmer]
- [metabase-enterprise.semantic-search.util :as semantic.u]
+ [metabase-enterprise.search.semantic.task.usage-trimmer :as semantic.task.trimmer]
+ [metabase-enterprise.search.semantic.util :as semantic.u]
[metabase.test.fixtures :as fixtures]
[toucan2.core :as t2])
(:import
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/test_util.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/test_util.clj
similarity index 97%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/test_util.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/test_util.clj
index 26cd07beae5..8a021912ccf 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/test_util.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/test_util.clj
@@ -1,24 +1,24 @@
-(ns metabase-enterprise.semantic-search.test-util
- {:clj-kondo/config '{:linters {:deprecated-var {:exclude {metabase.test.data/mbql-query {:namespaces [metabase-enterprise.semantic-search.test-util]}}}}}}
+(ns metabase-enterprise.search.semantic.test-util
+ {:clj-kondo/config '{:linters {:deprecated-var {:exclude {metabase.test.data/mbql-query {:namespaces [metabase-enterprise.search.semantic.test-util]}}}}}}
(:require
[clojure.string :as str]
[clojure.test :refer :all]
[environ.core :refer [env]]
[honey.sql :as sql]
[honey.sql.helpers :as sql.helpers]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.db.migration :as semantic.db.migration]
- [metabase-enterprise.semantic-search.dlq :as semantic.dlq]
- [metabase-enterprise.semantic-search.embedding :as semantic.embedding]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.index-metadata :as semantic.index-metadata]
- [metabase-enterprise.semantic-search.indexer :as semantic.indexer]
- [metabase-enterprise.semantic-search.pgvector-api :as semantic.pgvector-api]
- [metabase-enterprise.semantic-search.settings :as semantic.settings]
- [metabase-enterprise.semantic-search.util :as semantic.util]
- [metabase.embeddings.provider :as embeddings.provider]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.db.migration :as semantic.db.migration]
+ [metabase-enterprise.search.semantic.dlq :as semantic.dlq]
+ [metabase-enterprise.search.semantic.embedding :as semantic.embedding]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.index-metadata :as semantic.index-metadata]
+ [metabase-enterprise.search.semantic.indexer :as semantic.indexer]
+ [metabase-enterprise.search.semantic.pgvector-api :as semantic.pgvector-api]
+ [metabase-enterprise.search.semantic.settings :as semantic.settings]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.search.config :as search.config]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.search.ingestion :as search.ingestion]
[metabase.test :as mt]
[metabase.test.initialize :as initialize]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/util_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/util_test.clj
similarity index 95%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/util_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/util_test.clj
index 343a004c095..be3fc7235c5 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/util_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/util_test.clj
@@ -1,9 +1,9 @@
-(ns metabase-enterprise.semantic-search.util-test
+(ns metabase-enterprise.search.semantic.util-test
(:require
[clojure.test :refer [deftest is testing use-fixtures]]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
- [metabase-enterprise.semantic-search.util :as semantic.util]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.util :as semantic.util]
[metabase.test :as mt]
[next.jdbc :as jdbc]))
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/vector_strategy_matrix_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/vector_strategy_matrix_test.clj
similarity index 99%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/vector_strategy_matrix_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/vector_strategy_matrix_test.clj
index b7343f86631..6ce057161e4 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/vector_strategy_matrix_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/vector_strategy_matrix_test.clj
@@ -1,4 +1,4 @@
-(ns metabase-enterprise.semantic-search.vector-strategy-matrix-test
+(ns metabase-enterprise.search.semantic.vector-strategy-matrix-test
"Quality matrix over the vector-search strategies on a small deterministic dataset.
Headline:
@@ -52,10 +52,10 @@
[clojure.core.memoize :as memoize]
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.scoring :as semantic.scoring]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.scoring :as semantic.scoring]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.permissions.models.permissions :as perms]
[metabase.permissions.models.permissions-group :as perms-group]
[metabase.test :as mt]
diff --git a/enterprise/backend/test/metabase_enterprise/semantic_search/without_init_test.clj b/enterprise/backend/test/metabase_enterprise/search/semantic/without_init_test.clj
similarity index 83%
rename from enterprise/backend/test/metabase_enterprise/semantic_search/without_init_test.clj
rename to enterprise/backend/test/metabase_enterprise/search/semantic/without_init_test.clj
index 3148ee85818..50902823732 100644
--- a/enterprise/backend/test/metabase_enterprise/semantic_search/without_init_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/search/semantic/without_init_test.clj
@@ -1,11 +1,11 @@
-(ns metabase-enterprise.semantic-search.without-init-test
+(ns metabase-enterprise.search.semantic.without-init-test
(:require
[clojure.test :refer :all]
- [metabase-enterprise.semantic-search.core :as semantic]
- [metabase-enterprise.semantic-search.db.datasource :as semantic.db.datasource]
- [metabase-enterprise.semantic-search.env :as semantic.env]
- [metabase-enterprise.semantic-search.index :as semantic.index]
- [metabase-enterprise.semantic-search.test-util :as semantic.tu]
+ [metabase-enterprise.search.semantic.core :as semantic]
+ [metabase-enterprise.search.semantic.db.datasource :as semantic.db.datasource]
+ [metabase-enterprise.search.semantic.env :as semantic.env]
+ [metabase-enterprise.search.semantic.index :as semantic.index]
+ [metabase-enterprise.search.semantic.test-util :as semantic.tu]
[metabase.test :as mt]))
(use-fixtures :once #'semantic.tu/once-fixture)
diff --git a/modules/embedder/src/metabase_enterprise/embedder/plugin.clj b/modules/embedder/src/metabase_enterprise/embedder/plugin.clj
index fb3f0cb9a6b..85b5781f353 100644
--- a/modules/embedder/src/metabase_enterprise/embedder/plugin.clj
+++ b/modules/embedder/src/metabase_enterprise/embedder/plugin.clj
@@ -3,7 +3,7 @@
(:require
[metabase-enterprise.embedder.catalog :as catalog]
[metabase.classloader.core :as classloader]
- [metabase.embeddings.provider :as embeddings.provider]
+ [metabase.search.embeddings.provider :as embeddings.provider]
[metabase.util.log :as log]))
(set! *warn-on-reflection* true)
diff --git a/src/metabase/collections/curation.clj b/src/metabase/collections/curation.clj
index 04c1f46fa31..beaf7ae9a51 100644
--- a/src/metabase/collections/curation.clj
+++ b/src/metabase/collections/curation.clj
@@ -37,7 +37,7 @@
- metabase.metabot.curation/curated-ids — source-of-truth check for recent views
- metabase-enterprise.data-complexity-score.complexity/enumerate-catalogs — set-membership mirror
for the `:metabot` catalog's Cards (Tables call [[curated?]] directly)
- - metabase-enterprise.semantic-search.db.migration.impl/add-data-authority-and-curated-columns! —
+ - metabase-enterprise.search.semantic.db.migration.impl/add-data-authority-and-curated-columns! —
recomputes the precomputed `curated` column for existing index rows
The signals above are populated at ingestion by the search specs, so a NEW signal must also be added to
diff --git a/src/metabase/core/core.clj b/src/metabase/core/core.clj
index ca3b82fee37..ba66f6f39e2 100644
--- a/src/metabase/core/core.clj
+++ b/src/metabase/core/core.clj
@@ -16,7 +16,6 @@
[metabase.driver.mysql]
[metabase.driver.postgres]
[metabase.embedding.settings :as embed.settings]
- [metabase.embeddings.startup :as embeddings.startup]
[metabase.events.core :as events]
[metabase.initialization-status.core :as init-status]
[metabase.llm.startup :as llm.startup]
@@ -28,6 +27,7 @@
[metabase.plugins.core :as plugins]
[metabase.premium-features.core :refer [defenterprise]]
[metabase.sample-data.core :as sample-data]
+ [metabase.search.embeddings.startup :as embeddings.startup]
[metabase.server.core :as server]
[metabase.settings.core :as setting]
[metabase.setup.core :as setup]
diff --git a/src/metabase/metabot/agent/profiles.clj b/src/metabase/metabot/agent/profiles.clj
index 005d6264808..49c51849cce 100644
--- a/src/metabase/metabot/agent/profiles.clj
+++ b/src/metabase/metabot/agent/profiles.clj
@@ -9,13 +9,13 @@
(:require
[malli.error :as me]
[metabase.api-scope.core :as api-scope]
- [metabase.entity-retrieval.core :as entity-retrieval]
[metabase.metabot.capabilities :as capabilities]
[metabase.metabot.scope :as scope]
[metabase.metabot.settings :as metabot.settings]
[metabase.metabot.skills :as skills]
[metabase.metabot.tools :as tools]
[metabase.metabot.tools.explorations :as tools.explorations]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
[metabase.util.malli.registry :as mr]))
diff --git a/src/metabase/metabot/tools/entity_retrieval.clj b/src/metabase/metabot/tools/entity_retrieval.clj
index 58704ee0d96..c38be67c381 100644
--- a/src/metabase/metabot/tools/entity_retrieval.clj
+++ b/src/metabase/metabot/tools/entity_retrieval.clj
@@ -13,13 +13,13 @@
The var/namespace name (`entity-retrieval`) is retained deliberately — the module is a home for
information retrieval generally, not 1:1 with this index or tool.
- Runs in the enterprise pgvector store via [[metabase.entity-retrieval.core]]."
+ Runs in the enterprise pgvector store via [[metabase.search.entity-retrieval.core]]."
(:require
[clojure.string :as str]
- [metabase.entity-retrieval.core :as entity-retrieval]
[metabase.metabot.scope :as scope]
[metabase.metabot.tools.search :as tools.search]
[metabase.metabot.tools.shared.llm-shape :as llm-shape]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
[metabase.util :as u]
[metabase.util.malli :as mu]))
diff --git a/src/metabase/models/resolution.clj b/src/metabase/models/resolution.clj
index f6fb01fa9ce..9d6b9441a3a 100644
--- a/src/metabase/models/resolution.clj
+++ b/src/metabase/models/resolution.clj
@@ -130,7 +130,7 @@
:model/Secret metabase.secrets.models.secret
:model/SecurityAdvisory metabase-enterprise.security-center.models.security-advisory
:model/Segment metabase.segments.models.segment
- :model/SemanticSearchTokenTracking metabase-enterprise.semantic-search.models.token-tracking
+ :model/SemanticSearchTokenTracking metabase-enterprise.search.semantic.models.token-tracking
:model/Session metabase.session.models.session
:model/Setting metabase.settings.models.setting
:model/SsoRelayState metabase-enterprise.sso.models.relay-state
diff --git a/src/metabase/osi/ai_context/api.clj b/src/metabase/osi/ai_context/api.clj
index 0b3d5ea5622..d86996ef066 100644
--- a/src/metabase/osi/ai_context/api.clj
+++ b/src/metabase/osi/ai_context/api.clj
@@ -4,11 +4,11 @@
(:require
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
- [metabase.entity-retrieval.core :as entity-retrieval]
[metabase.osi.db :as osi.db]
[metabase.osi.models.osi-ai-context :as osi-ai-context]
[metabase.osi.schema :as osi.schema]
[metabase.request.core :as request]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
[metabase.util.malli :as mu]
[metabase.util.malli.schema :as ms]))
diff --git a/src/metabase/osi/models/osi_ai_context.clj b/src/metabase/osi/models/osi_ai_context.clj
index b54031f74ef..9a52845853b 100644
--- a/src/metabase/osi/models/osi_ai_context.clj
+++ b/src/metabase/osi/models/osi_ai_context.clj
@@ -14,12 +14,12 @@
(:require
[clojure.string :as str]
[metabase.app-db.core :as app-db]
- [metabase.entity-retrieval.core :as entity-retrieval]
- [metabase.entity-retrieval.mirror :as mirror]
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
[metabase.osi.db :as osi.db]
[metabase.osi.schema]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
+ [metabase.search.entity-retrieval.mirror :as mirror]
[metabase.util :as u]
[methodical.core :as methodical]
[toucan2.core :as t2]))
diff --git a/src/metabase/osi/schema.clj b/src/metabase/osi/schema.clj
index e4288a2c8de..3318396af6a 100644
--- a/src/metabase/osi/schema.clj
+++ b/src/metabase/osi/schema.clj
@@ -1,7 +1,7 @@
(ns metabase.osi.schema
"Malli schemas for the osi module."
(:require
- [metabase.entity-retrieval.core :as entity-retrieval]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
[metabase.util.malli.registry :as mr]
[metabase.util.malli.schema :as ms]))
diff --git a/src/metabase/permissions/models/permissions.clj b/src/metabase/permissions/models/permissions.clj
index 5cd199d8320..b276116d399 100644
--- a/src/metabase/permissions/models/permissions.clj
+++ b/src/metabase/permissions/models/permissions.clj
@@ -467,7 +467,7 @@
;; `:t2-methods` maps t2-model-kw → the installed `mi/can-read?` fn (identity-check test uses the value).
;; `:search-models` maps search-model-string → claimed parent t2-model the `:collection_id` is denormalized
;; from at index time. The claim is verified against the spec's joins by a contract test; see
- ;; `metabase-enterprise.semantic-search.index-test`.
+ ;; `metabase-enterprise.search.semantic.index-test`.
(atom {:t2-methods {} :search-models {}}))
(defn collection-id-only-read-models
diff --git a/src/metabase/search/config.clj b/src/metabase/search/config.clj
index 743350d946d..8356c062e57 100644
--- a/src/metabase/search/config.clj
+++ b/src/metabase/search/config.clj
@@ -400,7 +400,7 @@
(def vector-search-strategies
"Valid semantic-search vector-search strategies, as keywords. Mastered here (rather than in the EE module)
so the OSS search API param and the EE semantic-search setting validation share one definition.
- Note: the per-strategy dispatch in [[metabase-enterprise.semantic-search.index/semantic-search-query]] is a
+ Note: the per-strategy dispatch in [[metabase-enterprise.search.semantic.index/semantic-search-query]] is a
separate dispatch (unknown strategies fall back to `:brute-force`) and must be updated by hand when
adding a strategy.
diff --git a/src/metabase/embeddings/provider.clj b/src/metabase/search/embeddings/provider.clj
similarity index 99%
rename from src/metabase/embeddings/provider.clj
rename to src/metabase/search/embeddings/provider.clj
index ef64950a5f4..88eb941edab 100644
--- a/src/metabase/embeddings/provider.clj
+++ b/src/metabase/search/embeddings/provider.clj
@@ -1,4 +1,4 @@
-(ns metabase.embeddings.provider
+(ns metabase.search.embeddings.provider
"Runtime registry and stable contract for embedding-provider plugins.
Plugin loading is capability-neutral and lives in `metabase.plugins`. This namespace owns only the embedding
diff --git a/src/metabase/embeddings/startup.clj b/src/metabase/search/embeddings/startup.clj
similarity index 90%
rename from src/metabase/embeddings/startup.clj
rename to src/metabase/search/embeddings/startup.clj
index 3440768f3aa..0d671519156 100644
--- a/src/metabase/embeddings/startup.clj
+++ b/src/metabase/search/embeddings/startup.clj
@@ -1,4 +1,4 @@
-(ns metabase.embeddings.startup
+(ns metabase.search.embeddings.startup
"Startup-time registration of the in-process embedding provider.
The provider registers itself while its plugin initializes, so every entry point that might embed has to run
@@ -12,7 +12,7 @@
(def embedder-plugin-name
"Manifest `info.name` of the in-process embedder.
- Pinned against the manifest by `metabase.embeddings.embedder-plugin-name-test`; a rename here without
+ Pinned against the manifest by `metabase.search.embeddings.embedder-plugin-name-test`; a rename here without
one there silently disables the plugin, since `plugins/registered?` looks it up by this exact string."
"Metabase In-Process Embedder")
diff --git a/src/metabase/entity_retrieval/core.clj b/src/metabase/search/entity_retrieval/core.clj
similarity index 94%
rename from src/metabase/entity_retrieval/core.clj
rename to src/metabase/search/entity_retrieval/core.clj
index 61299941ec2..c4d66a6156a 100644
--- a/src/metabase/entity_retrieval/core.clj
+++ b/src/metabase/search/entity_retrieval/core.clj
@@ -1,4 +1,4 @@
-(ns metabase.entity-retrieval.core
+(ns metabase.search.entity-retrieval.core
"Public API of the `entity-retrieval` module.
The library entity index is a pgvector index of every library entity's name/description plus its OSI
@@ -11,16 +11,16 @@
the current user can read."
(:require
[clojure.string :as str]
- [metabase.entity-retrieval.db :as entity-retrieval.db]
- [metabase.entity-retrieval.mirror]
+ [metabase.search.entity-retrieval.db :as entity-retrieval.db]
+ [metabase.search.entity-retrieval.mirror]
[potemkin :as p]))
-(comment metabase.entity-retrieval.mirror/keep-me)
+(comment metabase.search.entity-retrieval.mirror/keep-me)
;; Re-exporting the var is not raw access: this namespace only bridges OSS/EE, and never reads a result.
#_{:clj-kondo/ignore [:discouraged-var]}
(p/import-vars
- [metabase.entity-retrieval.mirror
+ [metabase.search.entity-retrieval.mirror
entity-retrieval-available?
force-reconcile!
library-entity-keys
diff --git a/src/metabase/entity_retrieval/db.clj b/src/metabase/search/entity_retrieval/db.clj
similarity index 96%
rename from src/metabase/entity_retrieval/db.clj
rename to src/metabase/search/entity_retrieval/db.clj
index 892837760a3..17fbc89e83f 100644
--- a/src/metabase/entity_retrieval/db.clj
+++ b/src/metabase/search/entity_retrieval/db.clj
@@ -1,4 +1,4 @@
-(ns metabase.entity-retrieval.db
+(ns metabase.search.entity-retrieval.db
"Application database queries for the entity retrieval module. Every function here is a direct Toucan 2 call with no
additional logic, so the rest of the module never talks to `toucan2.core` itself."
(:require
diff --git a/src/metabase/entity_retrieval/mirror.clj b/src/metabase/search/entity_retrieval/mirror.clj
similarity index 85%
rename from src/metabase/entity_retrieval/mirror.clj
rename to src/metabase/search/entity_retrieval/mirror.clj
index 1e8a83b27ad..f5f956598e1 100644
--- a/src/metabase/entity_retrieval/mirror.clj
+++ b/src/metabase/search/entity_retrieval/mirror.clj
@@ -1,9 +1,9 @@
-(ns metabase.entity-retrieval.mirror
+(ns metabase.search.entity-retrieval.mirror
"OSS entry points for the enterprise pgvector `library_entity_index`.
The appdb (`osi_ai_context` + library membership) is authoritative; the index carries one embedding
per value-document and serves the `retrieve_library_entities` Metabot tool's similarity search.
- These `defenterprise` shims route to [[metabase-enterprise.entity-retrieval.core]] when an enterprise
+ These `defenterprise` shims route to [[metabase-enterprise.search.entity-retrieval.core]] when an enterprise
license with library retrieval is present; otherwise they no-op or return empty."
(:require
[metabase.premium-features.core :refer [defenterprise]]))
@@ -13,14 +13,14 @@
`:library-retrieval` features licensed, an embedding backend available, and the index built for the
current model and populated. `false` in OSS (no index). Re-evaluated per use — pgvector config is
boot-fixed but license/settings can flip at runtime."
- metabase-enterprise.entity-retrieval.core
+ metabase-enterprise.search.entity-retrieval.core
[]
false)
(defenterprise request-entity-sync!
"Ask the targeted write path to reconcile one library entity's index slice soon; no-op in OSS.
Fire-and-forget: never throws, does no embedding or pgvector work on the calling thread."
- metabase-enterprise.entity-retrieval.core
+ metabase-enterprise.search.entity-retrieval.core
[_entity-type _entity-local-id]
nil)
@@ -29,7 +29,7 @@
Returns {:index <inserted/deleted/unchanged> :execution <waited_ms/ran_ms>}; nil in OSS (no index to
reconcile).
See the enterprise impl for the queue-and-coalesce semantics."
- metabase-enterprise.entity-retrieval.core
+ metabase-enterprise.search.entity-retrieval.core
[]
nil)
@@ -41,7 +41,7 @@
The index is user-agnostic, so a hit's names, descriptions, synonyms, and examples may belong to an entity
the current user cannot read. Anything user-facing must first resolve each entity against the appdb, keep
only the readable ones, and drop hits that no longer resolve."
- metabase-enterprise.entity-retrieval.core
+ metabase-enterprise.search.entity-retrieval.core
[_user-search-prompt _limit]
[])
@@ -49,6 +49,6 @@
"Set of `[entity_type entity_local_id]` for every entity currently in the library; nil in OSS.
The tool drops index hits whose entity has since left the library (the index is eventually consistent),
computing membership live the way reconcile does."
- metabase-enterprise.entity-retrieval.core
+ metabase-enterprise.search.entity-retrieval.core
[]
nil)
diff --git a/src/metabase/search/semantic/core.clj b/src/metabase/search/semantic/core.clj
index 35596f527de..0a6eddfa265 100644
--- a/src/metabase/search/semantic/core.clj
+++ b/src/metabase/search/semantic/core.clj
@@ -16,45 +16,45 @@
(defenterprise supported?
"Check if semantic search is supported on this instance."
- metabase-enterprise.semantic-search.core
+ metabase-enterprise.search.semantic.core
[]
false)
(defenterprise results
"Execute a semantic search query and return results."
- metabase-enterprise.semantic-search.core
+ metabase-enterprise.search.semantic.core
[_search-ctx]
(oss-semantic-search-error))
(defenterprise update-index!
"Update the semantic search index with the given documents."
- metabase-enterprise.semantic-search.core
+ metabase-enterprise.search.semantic.core
[_document-reducible]
(oss-semantic-search-error))
(defenterprise delete-from-index!
"Delete documents from the semantic search index."
- metabase-enterprise.semantic-search.core
+ metabase-enterprise.search.semantic.core
[_model _ids]
(oss-semantic-search-error))
(defenterprise init!
"Initialize the semantic search index."
- metabase-enterprise.semantic-search.core
+ metabase-enterprise.search.semantic.core
[_searchable-documents _opts]
(oss-semantic-search-error))
(defenterprise repair-index!
"Brings the semantic search index into consistency with the provided document set.
Does not promise a full reindex, but will add missing documents and remove stale ones."
- metabase-enterprise.semantic-search.core
+ metabase-enterprise.search.semantic.core
[_searchable-documents]
(oss-semantic-search-error))
(defenterprise diagnose
"Engine-owned diagnostic stages (`missing-from-index` / `filtered` / `not-matching` / `candidate`) for the
semantic search index. See [[metabase.search.debug/diagnose]]."
- metabase-enterprise.semantic-search.core
+ metabase-enterprise.search.semantic.core
[_search-ctx _expected-model _expected-id]
(oss-semantic-search-error))
diff --git a/test/metabase/metabot/agent/profiles_test.clj b/test/metabase/metabot/agent/profiles_test.clj
index c15bc0fb270..80ef74c4700 100644
--- a/test/metabase/metabot/agent/profiles_test.clj
+++ b/test/metabase/metabot/agent/profiles_test.clj
@@ -2,10 +2,10 @@
(:require
[clojure.test :refer :all]
[metabase.api-scope.core :as api-scope]
- [metabase.entity-retrieval.core :as entity-retrieval]
[metabase.metabot.agent.profiles :as profiles]
[metabase.metabot.scope :as scope]
[metabase.metabot.tools :as tools]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
[metabase.test :as mt]))
(deftest get-profile-test
diff --git a/test/metabase/metabot/tools/entity_retrieval_test.clj b/test/metabase/metabot/tools/entity_retrieval_test.clj
index 73fa4304618..2ad6fc91d9f 100644
--- a/test/metabase/metabot/tools/entity_retrieval_test.clj
+++ b/test/metabase/metabot/tools/entity_retrieval_test.clj
@@ -2,9 +2,9 @@
(:require
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase.entity-retrieval.core :as cs.core]
[metabase.metabot.tools.entity-retrieval :as entity-retrieval]
[metabase.metabot.tools.search :as tools.search]
+ [metabase.search.entity-retrieval.core :as cs.core]
[metabase.test :as mt]))
(set! *warn-on-reflection* true)
diff --git a/test/metabase/metabot/tools_test.clj b/test/metabase/metabot/tools_test.clj
index ee5930e4246..0c8f757c538 100644
--- a/test/metabase/metabot/tools_test.clj
+++ b/test/metabase/metabot/tools_test.clj
@@ -3,7 +3,6 @@
[clojure.test :refer :all]
[metabase.api-scope.core :as api-scope]
[metabase.channel.settings :as channel.settings]
- [metabase.entity-retrieval.core :as entity-retrieval]
[metabase.metabot.agent.profiles :as profiles]
[metabase.metabot.scope :as scope]
[metabase.metabot.tools :as agent-tools]
@@ -11,6 +10,7 @@
[metabase.metabot.tools.construct :as construct]
[metabase.metabot.tools.shared :as shared]
[metabase.notification.models :as models.notification]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
[metabase.test :as mt]
[toucan2.core :as t2]))
diff --git a/test/metabase/osi/models/osi_ai_context_test.clj b/test/metabase/osi/models/osi_ai_context_test.clj
index 8043ccfaa31..e500c8f8026 100644
--- a/test/metabase/osi/models/osi_ai_context_test.clj
+++ b/test/metabase/osi/models/osi_ai_context_test.clj
@@ -1,7 +1,7 @@
(ns metabase.osi.models.osi-ai-context-test
(:require
[clojure.test :refer :all]
- [metabase.entity-retrieval.mirror :as mirror]
+ [metabase.search.entity-retrieval.mirror :as mirror]
[metabase.test :as mt]
[metabase.util :as u]
[toucan2.core :as t2]))
diff --git a/test/metabase/embeddings/embedder_plugin_artifact_test.clj b/test/metabase/search/embeddings/embedder_plugin_artifact_test.clj
similarity index 98%
rename from test/metabase/embeddings/embedder_plugin_artifact_test.clj
rename to test/metabase/search/embeddings/embedder_plugin_artifact_test.clj
index 1164bf3ca21..221e25bcd1a 100644
--- a/test/metabase/embeddings/embedder_plugin_artifact_test.clj
+++ b/test/metabase/search/embeddings/embedder_plugin_artifact_test.clj
@@ -1,12 +1,12 @@
-(ns metabase.embeddings.embedder-plugin-artifact-test
+(ns metabase.search.embeddings.embedder-plugin-artifact-test
(:require
[clojure.java.io :as io]
[clojure.string :as str]
[clojure.test :refer :all]
- [metabase.embeddings.provider :as embeddings.provider]
- [metabase.embeddings.startup :as embeddings.startup]
[metabase.plugins.impl :as plugins]
- [metabase.plugins.initialize :as plugin-initialize])
+ [metabase.plugins.initialize :as plugin-initialize]
+ [metabase.search.embeddings.provider :as embeddings.provider]
+ [metabase.search.embeddings.startup :as embeddings.startup])
(:import
(java.net Proxy ProxySelector)))
diff --git a/test/metabase/embeddings/embedder_plugin_name_test.clj b/test/metabase/search/embeddings/embedder_plugin_name_test.clj
similarity index 79%
rename from test/metabase/embeddings/embedder_plugin_name_test.clj
rename to test/metabase/search/embeddings/embedder_plugin_name_test.clj
index cad310d8ff7..572cf4ef714 100644
--- a/test/metabase/embeddings/embedder_plugin_name_test.clj
+++ b/test/metabase/search/embeddings/embedder_plugin_name_test.clj
@@ -1,7 +1,7 @@
-(ns metabase.embeddings.embedder-plugin-name-test
+(ns metabase.search.embeddings.embedder-plugin-name-test
(:require
[clojure.test :refer :all]
- [metabase.embeddings.startup :as embeddings.startup]
+ [metabase.search.embeddings.startup :as embeddings.startup]
[metabase.util.yaml :as yaml]))
(set! *warn-on-reflection* true)
diff --git a/test/metabase/embeddings/provider_test.clj b/test/metabase/search/embeddings/provider_test.clj
similarity index 98%
rename from test/metabase/embeddings/provider_test.clj
rename to test/metabase/search/embeddings/provider_test.clj
index 832d0eb8a26..13bfb04c5bb 100644
--- a/test/metabase/embeddings/provider_test.clj
+++ b/test/metabase/search/embeddings/provider_test.clj
@@ -1,7 +1,7 @@
-(ns metabase.embeddings.provider-test
+(ns metabase.search.embeddings.provider-test
(:require
[clojure.test :refer :all]
- [metabase.embeddings.provider :as embedding.provider]))
+ [metabase.search.embeddings.provider :as embedding.provider]))
(set! *warn-on-reflection* true)
@@ -94,7 +94,7 @@
(embedding.provider/resolve-model (assoc resolved :embedding-space-id "stale-space"))
(is false "expected a changed embedding space to be rejected")
(catch clojure.lang.ExceptionInfo e
- (is (= :metabase.embeddings.provider/embedding-space-changed (:type (ex-data e))))))))
+ (is (= :metabase.search.embeddings.provider/embedding-space-changed (:type (ex-data e))))))))
(testing "revisioned legacy descriptors round-trip without changing identity"
(let [revisioned (embedding.provider/resolve-model (assoc requested :model-revision "revision-1"))]
(is (= "revision-1" (:model-revision revisioned)))
diff --git a/test/metabase/entity_retrieval/core_test.clj b/test/metabase/search/entity_retrieval/core_test.clj
similarity index 95%
rename from test/metabase/entity_retrieval/core_test.clj
rename to test/metabase/search/entity_retrieval/core_test.clj
index ff9e02f683b..9a9a71c168d 100644
--- a/test/metabase/entity_retrieval/core_test.clj
+++ b/test/metabase/search/entity_retrieval/core_test.clj
@@ -1,7 +1,7 @@
-(ns metabase.entity-retrieval.core-test
+(ns metabase.search.entity-retrieval.core-test
(:require
[clojure.test :refer :all]
- [metabase.entity-retrieval.core :as entity-retrieval]
+ [metabase.search.entity-retrieval.core :as entity-retrieval]
[metabase.test :as mt]))
(deftest ^:parallel entity-class-test
diff --git a/test_resources/search/arctic_embed_l_v2_vectors.edn b/test_resources/search/arctic_embed_l_v2_vectors.edn
index 7af388d79ad..f0309be6016 100644
--- a/test_resources/search/arctic_embed_l_v2_vectors.edn
+++ b/test_resources/search/arctic_embed_l_v2_vectors.edn
@@ -3,7 +3,7 @@
;; Document inputs use ingestion's `[card]\nname: ...` embeddable-text format.
;; Values are 1024 IEEE-754 float32 components in big-endian Base64.
;; Decoding is local; no model or network access is needed by the test.
-;; Regenerate with metabase-enterprise.semantic-search.query-semantics-vectors/freeze!.
+;; Regenerate with metabase-enterprise.search.semantic.query-semantics-vectors/freeze!.
{:model "Snowflake/snowflake-arctic-embed-l-v2.0"
:ollama-model-id "5de93a84837d"
:dimensions 1024