sqlmesh 0.182.1.dev7__py3-none-any.whl → 0.182.1.dev8__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.182.1.dev7'
-__version_tuple__ = version_tuple = (0, 182, 1, 'dev7')
+__version__ = version = '0.182.1.dev8'
+__version_tuple__ = version_tuple = (0, 182, 1, 'dev8')

sqlmesh/core/model/common.py

@@ -145,6 +145,8 @@ def _add_variables_to_python_env(
         python_env,
         None,
         strict_resolution=strict_resolution,
+        variables=variables,
+        blueprint_variables=blueprint_variables,
     )
     used_variables = (used_variables or set()) | python_used_variables
 
@@ -163,7 +165,11 @@ def _add_variables_to_python_env(
 
 
 def parse_dependencies(
-    python_env: t.Dict[str, Executable], entrypoint: t.Optional[str], strict_resolution: bool = True
+    python_env: t.Dict[str, Executable],
+    entrypoint: t.Optional[str],
+    strict_resolution: bool = True,
+    variables: t.Optional[t.Dict[str, t.Any]] = None,
+    blueprint_variables: t.Optional[t.Dict[str, t.Any]] = None,
 ) -> t.Tuple[t.Set[str], t.Set[str]]:
     """
     Parses the source of a model function and finds upstream table dependencies
@@ -174,13 +180,29 @@ def parse_dependencies(
         entrypoint: The name of the function.
         strict_resolution: If true, the arguments of `table` and `resolve_table` calls must
             be resolvable at parse time, otherwise an exception will be raised.
+        variables: The variables available to the python environment.
+        blueprint_variables: The blueprint variables available to the python environment.
 
     Returns:
         A tuple containing the set of upstream table dependencies and the set of referenced variables.
     """
+
+    class VariableResolutionContext:
+        """This enables calls like `resolve_table` to reference `var()` and `blueprint_var()`."""
+
+        @staticmethod
+        def var(var_name: str, default: t.Optional[t.Any] = None) -> t.Optional[t.Any]:
+            return (variables or {}).get(var_name.lower(), default)
+
+        @staticmethod
+        def blueprint_var(var_name: str, default: t.Optional[t.Any] = None) -> t.Optional[t.Any]:
+            return (blueprint_variables or {}).get(var_name.lower(), default)
+
     env = prepare_env(python_env)
+    local_env = dict.fromkeys(("context", "evaluator"), VariableResolutionContext)
+
     depends_on = set()
-    variables = set()
+    used_variables = set()
 
     for executable in python_env.values():
         if not executable.is_definition:
@@ -206,7 +228,7 @@ def parse_dependencies(
 
                     try:
                         expression = to_source(first_arg)
-                        return eval(expression, env)
+                        return eval(expression, env, local_env)
                     except Exception:
                         if strict_resolution:
                             raise ConfigError(
@@ -217,7 +239,7 @@ def parse_dependencies(
                 if func.value.id == "context" and func.attr in ("table", "resolve_table"):
                     depends_on.add(get_first_arg("model_name"))
                 elif func.value.id in ("context", "evaluator") and func.attr == c.VAR:
-                    variables.add(get_first_arg("var_name").lower())
+                    used_variables.add(get_first_arg("var_name").lower())
             elif (
                 isinstance(node, ast.Attribute)
                 and isinstance(node.value, ast.Name)
@@ -225,9 +247,9 @@ def parse_dependencies(
                 and node.attr == c.GATEWAY
             ):
                 # Check whether the gateway attribute is referenced.
-                variables.add(c.GATEWAY)
+                used_variables.add(c.GATEWAY)
             elif isinstance(node, ast.FunctionDef) and node.name == entrypoint:
-                variables.update(
+                used_variables.update(
                     [
                         arg.arg
                         for arg in [*node.args.args, *node.args.kwonlyargs]
@@ -235,7 +257,7 @@ def parse_dependencies(
                     ]
                 )
 
-    return depends_on, variables
+    return depends_on, used_variables
 
 
 def single_value_or_tuple(values: t.Sequence) -> exp.Identifier | exp.Tuple:

sqlmesh/core/model/definition.py

@@ -2286,7 +2286,13 @@ def create_python_model(
     dependencies_unspecified = depends_on is None
 
     parsed_depends_on, referenced_variables = (
-        parse_dependencies(python_env, entrypoint, strict_resolution=dependencies_unspecified)
+        parse_dependencies(
+            python_env,
+            entrypoint,
+            strict_resolution=dependencies_unspecified,
+            variables=variables,
+            blueprint_variables=blueprint_variables,
+        )
         if python_env is not None
         else (set(), set())
     )

{sqlmesh-0.182.1.dev7.dist-info → sqlmesh-0.182.1.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlmesh
-Version: 0.182.1.dev7
+Version: 0.182.1.dev8
 Summary: Next-generation data transformation framework
 Author-email: "TobikoData Inc." <engineering@tobikodata.com>
 License:                                  Apache License

{sqlmesh-0.182.1.dev7.dist-info → sqlmesh-0.182.1.dev8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sqlmesh/__init__.py,sha256=DRovDXI-9D9xeYDP7t8Fq7mI31S2btlN-LHPOK3y7PA,7240
-sqlmesh/_version.py,sha256=9b85FTpPC45M5reNcsVvi-s22K4EsW4QQLdq32wBw4c,528
+sqlmesh/_version.py,sha256=0cBxYyFyc4y65tFNYy9sudbTOs3xn0j-JeOIT8EUJo4,528
 sqlmesh/magics.py,sha256=9oY1Uz8uwsuTtPRg9HTYDxnGiJ7-OVRCpmCgAhbKHUU,39431
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -85,9 +85,9 @@ sqlmesh/core/metric/definition.py,sha256=Yd5aVgsZCDPJ43aGP7WqtzZOuuSUtB8uJGVA6Jw
 sqlmesh/core/metric/rewriter.py,sha256=GiSTHfn2kinqCfNPYgZPRk93JFLzVaaejHtHDQ0yXZI,7326
 sqlmesh/core/model/__init__.py,sha256=C8GRZ53xuXEA9hQv3BQS9pNNyd9rZ06R_B96UYGhDu4,1644
 sqlmesh/core/model/cache.py,sha256=hzpGPXxp2LFMEp6gm-8DULJKCBDGf-1kTQcfNt0xrRM,7028
-sqlmesh/core/model/common.py,sha256=-ObfpO9JnTAnDI1FDwOS-vkbpqBhDL8OQ2-E3KcRjXY,14724
+sqlmesh/core/model/common.py,sha256=Lr2o0KCMt3HPqlc_4uiNz5BhYSUdm5bzvjCaIz58H7A,15724
 sqlmesh/core/model/decorator.py,sha256=v_sVudNROGrtj5cZ3vgcOFnwPdzwoUGY6REAkQpIMQc,8927
-sqlmesh/core/model/definition.py,sha256=68ureIjncctSdaBboY2UgfPnx6jHEefH7o-55lRuL2Y,108820
+sqlmesh/core/model/definition.py,sha256=qwj9smoaeVZglkTON6HTTlGzOvPwhmjgcaQ160Pjo6E,108953
 sqlmesh/core/model/kind.py,sha256=em6wq0W4pDnxl9sBgNweosnZH1on3h349t0Pn76wwBM,35867
 sqlmesh/core/model/meta.py,sha256=v-g1lnGPoeZ2SjV2CbVjvlec9buydiOFKkZWUm2dQPs,19071
 sqlmesh/core/model/schema.py,sha256=QzM1cOfukuK3L-cEE9MtxKeYec3x5JvutdZAnczJSiQ,3858
@@ -266,7 +266,7 @@ sqlmesh/utils/pandas.py,sha256=j_tYhuPcWpzuPceZZ6IhdTVbmxYyGJW7l4FHr4bQqjM,1824
 sqlmesh/utils/pydantic.py,sha256=ioaAzYF42PutEJRyAS11-AHguiCG3yWI6VRcTVa2G-g,10470
 sqlmesh/utils/rich.py,sha256=xNZyPCqEc4TAlJlsEthg-5eYUWpaizz0QjBzO7a1Yv4,1509
 sqlmesh/utils/yaml.py,sha256=np-WVcwmwsKghCgAj1OBBMsK1SXSRn4wR-H37cGiFr8,2282
-sqlmesh-0.182.1.dev7.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.182.1.dev8.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=nPqIDCJmonOaEAp4hhwrwgPdwt_F-5zzw-WW1kJqq3I,5472
 web/client/dist/assets/Audits-DiRd7NXk.js,sha256=Q5dIFqsHps-vVYD8037NpTPW_1juQgn_Ov45smEm7Y8,1041
@@ -384,8 +384,8 @@ web/server/api/endpoints/models.py,sha256=SzS5bshzdXyM6hb948sZ_3k-xhpGCHkxkb7pHz
 web/server/api/endpoints/modules.py,sha256=8hqqgonGay_mJmpCw0IdbjsPhWlQH2VLdKAqha-myac,468
 web/server/api/endpoints/plan.py,sha256=OYuQ_4dgbhG9ibTcX1a8mvYgH3ANxw9Fhbb4wg6QWqc,9222
 web/server/api/endpoints/table_diff.py,sha256=Wd5YxeKbZB7AkrDvqFgvV9ZQlnKYOF1n5W_w2EHE_Zw,2085
-sqlmesh-0.182.1.dev7.dist-info/METADATA,sha256=ncRuRPs9PmQKYBR044ay0WkRee10Jbm_MXGbPF1rYTA,25252
-sqlmesh-0.182.1.dev7.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-sqlmesh-0.182.1.dev7.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.182.1.dev7.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.182.1.dev7.dist-info/RECORD,,
+sqlmesh-0.182.1.dev8.dist-info/METADATA,sha256=Fjfu0gFZBBHENYA0mS6cubRQBTCtP9dXx7YF1iX8IoE,25252
+sqlmesh-0.182.1.dev8.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+sqlmesh-0.182.1.dev8.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.182.1.dev8.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.182.1.dev8.dist-info/RECORD,,