Fix: Exclude non-model references from the selector's output (#2068)

Author: izeigerman

sqlmesh/core/selector.py

@@ -134,11 +134,16 @@ def _get_value_and_dependency_inclusion(value: str) -> t.Tuple[str, bool, bool]:
         return value, include_upstream, include_downstream
 
     def _get_models(
-        self, model_name: str, include_upstream: bool, include_downstream: bool
+        self,
+        model_name: str,
+        include_upstream: bool,
+        include_downstream: bool,
+        models: t.Optional[t.Dict[str, Model]] = None,
     ) -> t.Set[str]:
         result = {model_name}
         if include_upstream:
-            result.update(self._dag.upstream(model_name))
+            models = models or self._models
+            result.update([u for u in self._dag.upstream(model_name) if u in models])
         if include_downstream:
             result.update(self._dag.downstream(model_name))
         return result
@@ -222,6 +227,8 @@ def expand_model_selections(
                 logger.warning(f"Expression '{selection}' doesn't match any models.")
 
             for model_fqn in matched_models:
-                results.update(self._get_models(model_fqn, include_upstream, include_downstream))
+                results.update(
+                    self._get_models(model_fqn, include_upstream, include_downstream, models=models)
+                )
 
         return results

tests/core/test_selector.py

@@ -349,6 +349,36 @@ def test_expand_model_tags(mocker: MockerFixture, make_snapshot, tags, tag_selec
     assert selector.expand_model_selections(tag_selections) == output
 
 
+def test_select_models_with_external_parent(mocker: MockerFixture):
+    default_catalog = "test_catalog"
+    added_model = SqlModel(
+        name="db.added_model",
+        query=d.parse_one("SELECT 1 AS a FROM external"),
+        default_catalog=default_catalog,
+        tags=["tag1"],
+    )
+
+    env_name = "test_env"
+
+    state_reader_mock = mocker.Mock()
+    state_reader_mock.get_environment.return_value = Environment(
+        name=env_name,
+        snapshots=[],
+        start_at="2023-01-01",
+        end_at="2023-02-01",
+        plan_id="test_plan_id",
+    )
+    state_reader_mock.get_snapshots.return_value = {}
+
+    local_models: UniqueKeyDict[str, Model] = UniqueKeyDict("models")
+    local_models[added_model.fqn] = added_model
+
+    selector = Selector(state_reader_mock, local_models, default_catalog=default_catalog)
+
+    expanded_selections = selector.expand_model_selections(["+*added_model*"])
+    assert expanded_selections == {added_model.fqn}
+
+
 def _assert_models_equal(actual: t.Dict[str, Model], expected: t.Dict[str, Model]) -> None:
     assert set(actual) == set(expected)
     for name, model in actual.items():