sqlmesh 0.199.1.dev33__py3-none-any.whl → 0.199.1.dev35__py3-none-any.whl

sqlmesh/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.199.1.dev33'
-__version_tuple__ = version_tuple = (0, 199, 1, 'dev33')
+__version__ = version = '0.199.1.dev35'
+__version_tuple__ = version_tuple = (0, 199, 1, 'dev35')

sqlmesh/core/context.py

@@ -948,10 +948,12 @@ class GenericContext(BaseContext, t.Generic[C]):
 
     def config_for_node(self, node: str | Model | Audit) -> Config:
         if isinstance(node, str):
-            return self.config_for_path(self.get_snapshot(node, raise_if_missing=True).node._path)[
-                0
-            ]  # type: ignore
-        return self.config_for_path(node._path)[0]  # type: ignore
+            path = self.get_snapshot(node, raise_if_missing=True).node._path
+        else:
+            path = node._path
+        if path is None:
+            return self.config
+        return self.config_for_path(path)[0]  # type: ignore
 
     @property
     def models(self) -> MappingProxyType[str, Model]:

sqlmesh/core/macros.py

@@ -171,7 +171,7 @@ class MacroEvaluator:
         resolve_tables: t.Optional[t.Callable[[exp.Expression], exp.Expression]] = None,
         snapshots: t.Optional[t.Dict[str, Snapshot]] = None,
         default_catalog: t.Optional[str] = None,
-        path: Path = Path(),
+        path: t.Optional[Path] = None,
         environment_naming_info: t.Optional[EnvironmentNamingInfo] = None,
         model_fqn: t.Optional[str] = None,
     ):
@@ -1384,7 +1384,7 @@ for m in macro.get_registry().values():
 def call_macro(
     func: t.Callable,
     dialect: DialectType,
-    path: Path,
+    path: t.Optional[Path],
     provided_args: t.Tuple[t.Any, ...],
     provided_kwargs: t.Dict[str, t.Any],
     **optional_kwargs: t.Any,
@@ -1431,7 +1431,7 @@ def _coerce(
     expr: t.Any,
     typ: t.Any,
     dialect: DialectType,
-    path: Path,
+    path: t.Optional[Path] = None,
     strict: bool = False,
 ) -> t.Any:
     """Coerces the given expression to the specified type on a best-effort basis."""

sqlmesh/core/model/definition.py

@@ -1648,6 +1648,8 @@ class SeedModel(_Model):
     def seed_path(self) -> Path:
         seed_path = Path(self.kind.path)
         if not seed_path.is_absolute():
+            if self._path is None:
+                raise SQLMeshError(f"Seed model '{self.name}' has no path")
             return self._path.parent / seed_path
         return seed_path
 
@@ -2022,7 +2024,7 @@ def load_sql_based_model(
     expressions: t.List[exp.Expression],
     *,
     defaults: t.Optional[t.Dict[str, t.Any]] = None,
-    path: Path = Path(),
+    path: t.Optional[Path] = None,
     module_path: Path = Path(),
     time_column_format: str = c.DEFAULT_TIME_COLUMN_FORMAT,
     macros: t.Optional[MacroRegistry] = None,
@@ -2173,6 +2175,8 @@ Learn more at https://sqlmesh.readthedocs.io/en/stable/concepts/models/overview
     # The name of the model will be inferred from its path relative to `models/`, if it's not explicitly specified
     name = meta_fields.pop("name", "")
     if not name and infer_names:
+        if path is None:
+            raise ValueError(f"Model {name} must have a name")
         name = get_model_name(path)
 
     if not name:
@@ -2251,7 +2255,7 @@ def create_seed_model(
     name: TableName,
     seed_kind: SeedKind,
     *,
-    path: Path = Path(),
+    path: t.Optional[Path] = None,
     module_path: Path = Path(),
     **kwargs: t.Any,
 ) -> Model:
@@ -2270,7 +2274,12 @@ def create_seed_model(
         seed_path = module_path.joinpath(*subdirs)
         seed_kind.path = str(seed_path)
     elif not seed_path.is_absolute():
-        seed_path = path / seed_path if path.is_dir() else path.parent / seed_path
+        if path is None:
+            seed_path = seed_path
+        elif path.is_dir():
+            seed_path = path / seed_path
+        else:
+            seed_path = path.parent / seed_path
 
     seed = create_seed(seed_path)
 
@@ -2405,7 +2414,7 @@ def _create_model(
     name: TableName,
     *,
     defaults: t.Optional[t.Dict[str, t.Any]] = None,
-    path: Path = Path(),
+    path: t.Optional[Path] = None,
     time_column_format: str = c.DEFAULT_TIME_COLUMN_FORMAT,
     jinja_macros: t.Optional[JinjaMacroRegistry] = None,
     jinja_macro_references: t.Optional[t.Set[MacroReference]] = None,
@@ -2593,7 +2602,7 @@ INSERT_SEED_MACRO_CALL = d.parse_one("@INSERT_SEED()")
 
 def _split_sql_model_statements(
     expressions: t.List[exp.Expression],
-    path: Path,
+    path: t.Optional[Path],
     dialect: t.Optional[str] = None,
 ) -> t.Tuple[
     t.Optional[exp.Expression],
@@ -2714,7 +2723,7 @@ def _refs_to_sql(values: t.Any) -> exp.Expression:
 def render_meta_fields(
     fields: t.Dict[str, t.Any],
     module_path: Path,
-    path: Path,
+    path: t.Optional[Path],
     jinja_macros: t.Optional[JinjaMacroRegistry],
     macros: t.Optional[MacroRegistry],
     dialect: DialectType,
@@ -2801,7 +2810,7 @@ def render_meta_fields(
 def render_model_defaults(
     defaults: t.Dict[str, t.Any],
     module_path: Path,
-    path: Path,
+    path: t.Optional[Path],
     jinja_macros: t.Optional[JinjaMacroRegistry],
     macros: t.Optional[MacroRegistry],
     dialect: DialectType,
@@ -2851,7 +2860,7 @@ def parse_defaults_properties(
 def render_expression(
     expression: exp.Expression,
     module_path: Path,
-    path: Path,
+    path: t.Optional[Path],
     jinja_macros: t.Optional[JinjaMacroRegistry] = None,
     macros: t.Optional[MacroRegistry] = None,
     dialect: DialectType = None,

sqlmesh/core/node.py

@@ -199,7 +199,7 @@ class _Node(PydanticModel):
     interval_unit_: t.Optional[IntervalUnit] = Field(alias="interval_unit", default=None)
     tags: t.List[str] = []
     stamp: t.Optional[str] = None
-    _path: Path = Path()
+    _path: t.Optional[Path] = None
     _data_hash: t.Optional[str] = None
     _metadata_hash: t.Optional[str] = None
 

sqlmesh/core/renderer.py

@@ -43,7 +43,7 @@ class BaseExpressionRenderer:
         expression: exp.Expression,
         dialect: DialectType,
         macro_definitions: t.List[d.MacroDef],
-        path: Path = Path(),
+        path: t.Optional[Path] = None,
         jinja_macro_registry: t.Optional[JinjaMacroRegistry] = None,
         python_env: t.Optional[t.Dict[str, Executable]] = None,
         only_execution_time: bool = False,

sqlmesh/core/snapshot/definition.py

@@ -2198,7 +2198,7 @@ def check_ready_intervals(
     context: ExecutionContext,
     python_env: t.Dict[str, Executable],
     dialect: DialectType = None,
-    path: Path = Path(),
+    path: t.Optional[Path] = None,
     kwargs: t.Optional[t.Dict] = None,
 ) -> Intervals:
     checked_intervals: Intervals = []

sqlmesh/dbt/converter/convert.py

@@ -207,6 +207,8 @@ def _convert_models(
 
         if model.kind.is_seed:
             # this will produce the original seed file, eg "items.csv"
+            if model._path is None:
+                raise ValueError(f"Unhandled model path for model {model_name}")
             seed_filename = model._path.relative_to(input_paths.seeds)
 
             # seed definition - rename "items.csv" -> "items.sql"
@@ -219,6 +221,8 @@ def _convert_models(
             assert isinstance(model.kind, SeedKind)
             model.kind.path = str(Path("../seeds", seed_filename))
         else:
+            if model._path is None:
+                raise ValueError(f"Unhandled model path for model {model_name}")
             if input_paths.models in model._path.parents:
                 model_filename = model._path.relative_to(input_paths.models)
             elif input_paths.snapshots in model._path.parents:
@@ -290,6 +294,8 @@ def _convert_standalone_audits(
 
         audit_definition_string = ";\n".join(stringified)
 
+        if audit._path is None:
+            continue
         audit_filename = audit._path.relative_to(input_paths.tests)
         audit_output_path = output_paths.audits / audit_filename
         audit_output_path.write_text(audit_definition_string)

sqlmesh/lsp/reference.py

@@ -164,6 +164,9 @@ def get_model_definitions_for_a_path(
     else:
         return []
 
+    if file_path is None:
+        return []
+
     # Find all possible references
     references: t.List[Reference] = []
 
@@ -246,6 +249,8 @@ def get_model_definitions_for_a_path(
                 if referenced_model is None:
                     continue
                 referenced_model_path = referenced_model._path
+                if referenced_model_path is None:
+                    continue
                 # Check whether the path exists
                 if not referenced_model_path.is_file():
                     continue
@@ -372,6 +377,9 @@ def get_macro_definitions_for_a_path(
     else:
         return []
 
+    if file_path is None:
+        return []
+
     references = []
     _, config_path = lsp_context.context.config_for_path(
         file_path,

sqlmesh/magics.py

@@ -287,8 +287,9 @@ class SQLMeshMagics(Magics):
             if loaded.name == args.model:
                 model = loaded
         else:
-            with open(model._path, "r", encoding="utf-8") as file:
-                expressions = parse(file.read(), default_dialect=config.dialect)
+            if model._path:
+                with open(model._path, "r", encoding="utf-8") as file:
+                    expressions = parse(file.read(), default_dialect=config.dialect)
 
         formatted = format_model_expressions(
             expressions,
@@ -307,8 +308,9 @@ class SQLMeshMagics(Magics):
             replace=True,
         )
 
-        with open(model._path, "w", encoding="utf-8") as file:
-            file.write(formatted)
+        if model._path:
+            with open(model._path, "w", encoding="utf-8") as file:
+                file.write(formatted)
 
         if sql:
             context.console.log_success(f"Model `{args.model}` updated")

{sqlmesh-0.199.1.dev33.dist-info → sqlmesh-0.199.1.dev35.dist-info}/METADATA

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

{sqlmesh-0.199.1.dev33.dist-info → sqlmesh-0.199.1.dev35.dist-info}/RECORD

@@ -1,6 +1,6 @@
 sqlmesh/__init__.py,sha256=QjwaamJIdW7voXoS880yAx7tHm-Im4_mqGA-XJgafos,7631
-sqlmesh/_version.py,sha256=5T0g4UqmbsatLteDgIpEM7vC58rbmEcRLYgrlf_5nsA,530
-sqlmesh/magics.py,sha256=R9U0Mp9ZQhDYe751nxAQDLaMv3zLAR4HcTdIflKTmEE,41709
+sqlmesh/_version.py,sha256=S9lEVv3QVWQs4d4mxXKYzMCuqOotm2m6JhCf7IGStXs,530
+sqlmesh/magics.py,sha256=tdkXrxkZug6LZ5F8TH4lx_XNV3T8bHGYTJUlGJfPQ4A,41777
 sqlmesh/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/cicd/bot.py,sha256=2zlbn-DXkqQzr3lA0__IGU4XaIfXBXBKLWXNI2DRJX8,759
@@ -13,17 +13,17 @@ sqlmesh/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/core/_typing.py,sha256=e1f7xO2aZCy38M_3VoDy-XI3shyd99-IFctgIFSgXWM,497
 sqlmesh/core/console.py,sha256=ObpdArJOXDOihWPXsWIUuwiQ64cMlroNWJHqQPkVqC0,160753
 sqlmesh/core/constants.py,sha256=gUABXWYgH_XOSbaZAJsR5o1dmA61JDCvBDyxqqXX3LM,2630
-sqlmesh/core/context.py,sha256=AuwB0PiV1jW7WZDaMOo_RkfKKTvwq6IDjByCHLA1GKw,124433
+sqlmesh/core/context.py,sha256=IKZxD5BnbwLKCRFt4s02W4HZ5REXFiOnyl6Ywhc3yA8,124456
 sqlmesh/core/context_diff.py,sha256=CeUmMBJzN__98YohrtAiIYPIZI9mrGBk6bVADWBLUw8,21692
 sqlmesh/core/dialect.py,sha256=1ykYwb9WZn_nCaX08PcQ0BJh2Pihv9SPvoMNjpMeCfs,50158
 sqlmesh/core/environment.py,sha256=7DbJX0r5nZRU3LhcgIxbSV-JosQYDjAt3V5Wc2Fpns8,13005
 sqlmesh/core/lineage.py,sha256=zjB0Zfamo2Fja2r5SSZPMbrEKTXr1WjozZPVqvxdybI,3143
 sqlmesh/core/loader.py,sha256=Imb65SX5TtvQrtlilin2hkYg12gm9e9c30I8o95nkVE,40534
-sqlmesh/core/macros.py,sha256=Me4QjgW_K4DzQVi8I3G0XwoC3cXSFFWt3sJyynZ2GOM,60585
-sqlmesh/core/node.py,sha256=9V2zLRRODgondxQdB6jA5wVH0KCYon70gre0LFBgrM8,14648
+sqlmesh/core/macros.py,sha256=ogIHo_Eh-Calty9NFuJ-QpfLNFBSauK738mg_srv4iM,60626
+sqlmesh/core/node.py,sha256=3ChBz1PIMJhp-jzed_GLBrtmEF2v_BVDEM5WNe0ssPk,14658
 sqlmesh/core/notification_target.py,sha256=PPGoDrgbRKxr27vJEu03XqNTQLYTw0ZF_b0yAapxGeI,16158
 sqlmesh/core/reference.py,sha256=k7OSkLqTjPR8WJjNeFj0xAJ297nZUMgb_iTVwKRRKjc,4875
-sqlmesh/core/renderer.py,sha256=ksdD2x2Q5Ns5fOLIGfWIznx_T3fXbP3CfwUhD5kVSOQ,26674
+sqlmesh/core/renderer.py,sha256=SVE1THHK1UVdPPHjmqNbBVIjmEYcK8tz5pWh1ss8xGs,26684
 sqlmesh/core/scheduler.py,sha256=5qSC-EHKotWpwFFvnwDHw3feYfz9c8_9gBGRfdeu8P4,40512
 sqlmesh/core/schema_diff.py,sha256=Sp2MoqAngp-yTYevkLaf9jb26SuAdGXoZ54g5MjWowU,30516
 sqlmesh/core/schema_loader.py,sha256=lvrI9k7hr1P4X4E6t3U-KrcuvdQuw0UdNlN90P2s52w,3563
@@ -88,7 +88,7 @@ sqlmesh/core/model/__init__.py,sha256=C8GRZ53xuXEA9hQv3BQS9pNNyd9rZ06R_B96UYGhDu
 sqlmesh/core/model/cache.py,sha256=csun0RJguHzKX6-qITcOs4fVP4f8_Ts8qiUVV4sHY6Q,7869
 sqlmesh/core/model/common.py,sha256=dPyqXLaDSnQgDVdbiOZ7YwomlaPIvGfyL-mHhc7bR1o,17830
 sqlmesh/core/model/decorator.py,sha256=wUUg5t0K559tV9Pqt6FE2EWXt5TPGb4wF2Yg4B4hX4w,9251
-sqlmesh/core/model/definition.py,sha256=mAcbq5chgFgDQi0f_p-lByvbFK9kIQgQfROqvP5LnB8,112396
+sqlmesh/core/model/definition.py,sha256=HivkFcm2f7UclH4j0oXd0qbJm919uFjkE3lfo-Smtd8,112780
 sqlmesh/core/model/kind.py,sha256=8Dp8yiTiXltboZWrB2FJ-LQ3zx4Fv_5Tj0KdUIPwCHI,36358
 sqlmesh/core/model/meta.py,sha256=D9InI9M2-IXeb34vkXNQSLALL8xVXjZ_LXwI-Tqxm7I,21197
 sqlmesh/core/model/schema.py,sha256=_HMYfzK9wWXh7_CQDIIGnuQUD4aiX3o5D2cRp2sERzc,3387
@@ -102,7 +102,7 @@ sqlmesh/core/plan/stages.py,sha256=7iiVZLSRoI1kSEMyOuuW6gvUA-eyALUfdW5vDh_N4jU,2
 sqlmesh/core/snapshot/__init__.py,sha256=Z5HTetNCZGoKF1WAKXk4LWL9dc8EC8lwS2O4TtoBmt4,1317
 sqlmesh/core/snapshot/cache.py,sha256=bgqCR2hyf6r2A_8QP1EnXFK25gDX37-Zg0YeMuETWxg,3934
 sqlmesh/core/snapshot/categorizer.py,sha256=qGG5870mu1jR2whKisSBH_GFbsyh96RnzJDgkN7DV9g,2482
-sqlmesh/core/snapshot/definition.py,sha256=JBrvHx9ZPVWxY649IOXOYs4RKPzgLYvfdxXsdCewad0,85738
+sqlmesh/core/snapshot/definition.py,sha256=DwYTNcDfPQUQ1osF_63SdicSj7oqVjtmPPEzqwsxDLU,85748
 sqlmesh/core/snapshot/evaluator.py,sha256=yNVxlTIV8_mKmUsIJtQtjT8RZHDHA64pUPds9VZfOq8,90503
 sqlmesh/core/state_sync/__init__.py,sha256=B60xj-_Xk-4jas3UphLvwkuf04G-9AyGckcblXE0aRg,869
 sqlmesh/core/state_sync/base.py,sha256=AdqWmbhnvRFqVcFK6L01uCvpBVAYGuMrm4P0D3u_NaU,18334
@@ -145,14 +145,12 @@ sqlmesh/dbt/util.py,sha256=BdtfQ7sxnZ8y8CFJStkePpmRE-KntHCXTefRnXR5Pag,905
 sqlmesh/dbt/converter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/dbt/converter/common.py,sha256=APynHIN5aeL1hyetIib67O-zRcae-Mw-QEQEihcMVpI,1454
 sqlmesh/dbt/converter/console.py,sha256=yTl08JyM_KM-Ya8VIX-l0r1rOsaxkBboiz-BbsF7SMU,4610
-sqlmesh/dbt/converter/convert.py,sha256=o3nh0l8eS_3TR2XlW4Z8oO585kLxsZaPPFH8qpOM0do,15567
+sqlmesh/dbt/converter/convert.py,sha256=CX3faG6oLhhItqghQTkqqpo2LaUdu3sIAeaofA4eymM,15854
 sqlmesh/dbt/converter/jinja.py,sha256=LwtMRWcVYv16cVilOekBjoFfnD-OBfaP90JpYy34jiw,25279
 sqlmesh/dbt/converter/jinja_builtins.py,sha256=EVWyDNn0wnSrn9T5TkmKdBBVdw0TzROlfwnSVgnMehM,4589
 sqlmesh/dbt/converter/jinja_transforms.py,sha256=MkgL3Wky2mHzLaEIqkCwiYQk99jL19Wt2pOoXhsqtqQ,17597
 sqlmesh/engines/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqlmesh/engines/commands.py,sha256=Fjy_seH1JL2EZxFNJBr0-eIaOn5PNY-JEb0nBbcr6Go,6094
 sqlmesh/engines/spark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqlmesh/engines/spark/app.py,sha256=du4Hh-3A7yHak54_CjL0W87X_Kl3btzHpUy9koIQXf4,3748
 sqlmesh/engines/spark/db_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sqlmesh/engines/spark/db_api/errors.py,sha256=LSXuHHhkzHvKlcdwmhCM9qm51KyKoP8gQH-p_W3Oow4,148
 sqlmesh/engines/spark/db_api/spark_session.py,sha256=uQP0VFFYtp3N9mK7zKw6SoiGVhJDDYPylqx46yDwGEc,4667
@@ -173,7 +171,7 @@ sqlmesh/lsp/description.py,sha256=PjguwyVw5YeYSgT0JMhkf5U1Jry-sDPLvQ2caIR9JPQ,85
 sqlmesh/lsp/helpers.py,sha256=EFc1u3-b7kSv5-tNwmKUDxId72RCLDBnN2lLTgRSzzQ,1020
 sqlmesh/lsp/hints.py,sha256=j-blccBUil94yRoDjWfkSM0HqMmsKD6hP2TaWdWWVk4,3734
 sqlmesh/lsp/main.py,sha256=TRuegZaC04cPDThtmz_zL6YqBpQz342brv1luIbDTZ8,38186
-sqlmesh/lsp/reference.py,sha256=NyfpK12TouDuy5-G7KOhvifkJItMfrakKwnMoU6SiVk,32088
+sqlmesh/lsp/reference.py,sha256=CjIXCJ5qM5mHyKRyM1brKyvpK9oQfLI0LiNKHfjJuVw,32257
 sqlmesh/lsp/rename.py,sha256=399v1vyVRHHxvbCHVcuS4Pl8K2N-Z60JdZ6e1znOI4s,4397
 sqlmesh/lsp/uri.py,sha256=mvSLbZGmMTHPpliThOtVWiFcHnfJzp1w39q9l-xD2SI,802
 sqlmesh/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -284,7 +282,7 @@ sqlmesh/utils/pydantic.py,sha256=o_NsXbIpDqNpUA1Uc5xF0ZzoXQYYB0DfHwdRxBwXPNk,120
 sqlmesh/utils/rich.py,sha256=BpB47G0-JcU41LkGkeGKroexj4NOV5fox4-GOIXPgIc,3545
 sqlmesh/utils/windows.py,sha256=r7Yin4WEwbvH7sKA3hOJtRsclmscNuBeCklCfVPvtQs,611
 sqlmesh/utils/yaml.py,sha256=hvo5lmybYLcIx4p6CQwufS8X4MbwS60lEBnCmYJCXmU,2336
-sqlmesh-0.199.1.dev33.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
+sqlmesh-0.199.1.dev35.dist-info/licenses/LICENSE,sha256=OlMefUjgWJdULtf84BLW0AZZcY8DwdgQqb_1j2862j8,11346
 web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 web/client/dist/index.html,sha256=DAv6ABGogw4xRLb0T_92WP_S7XWyqVhwBgGKWtuQwU4,5472
 web/client/dist/assets/Audits-BuHAmFO8.js,sha256=zbYUF6WdUGMbnMm01GMNPb7xAJwj-o5wMdL56vPo2qE,1041
@@ -384,9 +382,9 @@ web/server/app.py,sha256=b6qEJ4btjaSm2kWwQUGV--S3VE8QW0Um7f4rBdaoB_M,59
 web/server/console.py,sha256=CJlhoNBVUj_U5h_88gQgDJNzLOe2FAQ1DcFeMdO3H18,14583
 web/server/exceptions.py,sha256=I2PPpChwhDWawQENr5kHg6DjyRGeiJ6OWZsCzEZhVzs,1533
 web/server/main.py,sha256=9PaDa8sigo1z0AxtI3sQ3fHmDqs6uXwP-_IvoMwkznw,3199
-web/server/models.py,sha256=NUI2xqDcav20uuC2BZ9xDL2x0v16-gpVT1Sb-WHfAcg,15518
+web/server/models.py,sha256=EzMxPLz_igDBZ3tMlI7niylVih_Hh7YITZAK3c8sOiA,15556
 web/server/openapi.py,sha256=NOg__YQg7arVdajQv5CvOA5KLTQCfGZFvwnjARuM6iE,586
-web/server/settings.py,sha256=PuWrOmn5LpJMBTymCMQreqMsL93tClTJ6wlcAZXjgCo,3755
+web/server/settings.py,sha256=_W50-Holci5Zv8goK7qATLRD1_Fcx-75gcNTVjdGDOc,3770
 web/server/utils.py,sha256=bb6AOM3Nga-zihPjZvJeDL6sHqTPNC_SYjklsy8tAQA,4013
 web/server/watcher.py,sha256=2c08EfXkgAfqpAEoFidkYjGH48DkLDyMueVp4afICHM,5334
 web/server/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -398,12 +396,12 @@ web/server/api/endpoints/events.py,sha256=tjhOhGe9jt7L1mOLLapl5qTvicDRnP5lPZHSq9
 web/server/api/endpoints/files.py,sha256=Rr0YS9Nz9vLH9KvGAfxbMlxN8j1XxU9CViFvlKoP2YQ,6747
 web/server/api/endpoints/lineage.py,sha256=XU99RI-6Q9SidItGM5WLQMje8NhM5nZWHbtWxDwWeFE,6050
 web/server/api/endpoints/meta.py,sha256=QKWWrHewGh5JS8mCSWXTKCIQwXw-TQfaT9tWt_SsNY4,1032
-web/server/api/endpoints/models.py,sha256=ud-lRwriyI_OYg9tZchrBgeiXELiRTLNEodrafB7Ndk,4697
+web/server/api/endpoints/models.py,sha256=kwj0s7uve3iZSMfmjkoPVMFMeY1sD0peTeyrWfzI0kI,4742
 web/server/api/endpoints/modules.py,sha256=8hqqgonGay_mJmpCw0IdbjsPhWlQH2VLdKAqha-myac,468
 web/server/api/endpoints/plan.py,sha256=bbbY50W_2MsZSTxOHWMKz0tbIm75nsRSlPy8GI2fg9Q,9306
 web/server/api/endpoints/table_diff.py,sha256=SCy3-pr5x6bEEiOaZGCDbiHQhpgxwmnz3Acqa2Ie6jI,2090
-sqlmesh-0.199.1.dev33.dist-info/METADATA,sha256=axV1xmnJ2hY9XY1prXmA2iBGNQeeuW9J1Z4gKA7qyks,26659
-sqlmesh-0.199.1.dev33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sqlmesh-0.199.1.dev33.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
-sqlmesh-0.199.1.dev33.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
-sqlmesh-0.199.1.dev33.dist-info/RECORD,,
+sqlmesh-0.199.1.dev35.dist-info/METADATA,sha256=2O2l5ufMQveHcekXHm4RlUfVObh5Pq_sSG_gm5BLqWE,26659
+sqlmesh-0.199.1.dev35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sqlmesh-0.199.1.dev35.dist-info/entry_points.txt,sha256=pIYKtg-u-uO7BK_Y0qrdmfyj0bYrcMc3Xiqr5WE3VFk,121
+sqlmesh-0.199.1.dev35.dist-info/top_level.txt,sha256=bspjo5vjELQkuN0qKuTFIbsrUt3Zeo8D2mlKeHG1LdE,12
+sqlmesh-0.199.1.dev35.dist-info/RECORD,,

web/server/api/endpoints/models.py

@@ -121,11 +121,12 @@ def serialize_model(context: Context, model: Model, render_query: bool = False)
         )
         sql = query.sql(pretty=True, dialect=model.dialect)
 
+    path = model._path
     return models.Model(
         name=model.name,
         fqn=model.fqn,
-        path=str(model._path.absolute().relative_to(context.path).as_posix()),
-        full_path=str(model._path.absolute().as_posix()),
+        path=str(path.absolute().relative_to(context.path).as_posix()) if path else None,
+        full_path=str(path.absolute().as_posix()) if path else None,
         dialect=dialect,
         columns=columns,
         details=details,

web/server/models.py

@@ -171,8 +171,8 @@ class Column(PydanticModel):
 class Model(PydanticModel):
     name: str
     fqn: str
-    path: str
-    full_path: str
+    path: t.Optional[str] = None
+    full_path: t.Optional[str] = None
     """
     As opposed to path, which is relative to the project root, full_path is the absolute path to the model file.
     """

web/server/settings.py

@@ -80,7 +80,7 @@ def _get_loaded_context(path: str | Path, config: str, gateway: str) -> Context:
 
 @lru_cache()
 def _get_path_to_model_mapping(context: Context) -> dict[Path, Model]:
-    return {model._path: model for model in context._models.values()}
+    return {model._path: model for model in context._models.values() if model._path}
 
 
 def get_path_to_model_mapping(

sqlmesh/engines/commands.py

@@ -1,184 +0,0 @@
-import typing as t
-from enum import Enum
-
-from sqlglot import exp
-from sqlmesh.core.environment import Environment, EnvironmentNamingInfo
-from sqlmesh.core.snapshot import (
-    DeployabilityIndex,
-    Snapshot,
-    SnapshotEvaluator,
-    SnapshotId,
-    SnapshotTableCleanupTask,
-    SnapshotTableInfo,
-)
-from sqlmesh.core.state_sync import cleanup_expired_views
-from sqlmesh.utils.date import TimeLike
-from sqlmesh.utils.errors import AuditError
-from sqlmesh.utils.pydantic import PydanticModel
-
-COMMAND_PAYLOAD_FILE_NAME = "payload.json"
-
-
-class CommandType(str, Enum):
-    EVALUATE = "evaluate"
-    PROMOTE = "promote"
-    DEMOTE = "demote"
-    CLEANUP = "cleanup"
-    CREATE_TABLES = "create_tables"
-    MIGRATE_TABLES = "migrate_tables"
-
-    # This makes it easy to integrate with argparse
-    def __str__(self) -> str:
-        return self.value
-
-
-class EvaluateCommandPayload(PydanticModel):
-    snapshot: Snapshot
-    parent_snapshots: t.Dict[str, Snapshot]
-    start: TimeLike
-    end: TimeLike
-    execution_time: TimeLike
-    deployability_index: DeployabilityIndex
-    batch_index: int
-
-
-class PromoteCommandPayload(PydanticModel):
-    snapshots: t.List[Snapshot]
-    environment_naming_info: EnvironmentNamingInfo
-    deployability_index: DeployabilityIndex
-
-
-class DemoteCommandPayload(PydanticModel):
-    snapshots: t.List[SnapshotTableInfo]
-    environment_naming_info: EnvironmentNamingInfo
-
-
-class CleanupCommandPayload(PydanticModel):
-    environments: t.List[Environment]
-    tasks: t.List[SnapshotTableCleanupTask]
-
-
-class CreateTablesCommandPayload(PydanticModel):
-    target_snapshot_ids: t.List[SnapshotId]
-    snapshots: t.List[Snapshot]
-    deployability_index: DeployabilityIndex
-    allow_destructive_snapshots: t.Set[str]
-
-
-class MigrateTablesCommandPayload(PydanticModel):
-    target_snapshot_ids: t.List[SnapshotId]
-    snapshots: t.List[Snapshot]
-    allow_destructive_snapshots: t.Set[str]
-
-
-def evaluate(
-    evaluator: SnapshotEvaluator, command_payload: t.Union[str, EvaluateCommandPayload]
-) -> None:
-    if isinstance(command_payload, str):
-        command_payload = EvaluateCommandPayload.parse_raw(command_payload)
-
-    parent_snapshots = command_payload.parent_snapshots
-    parent_snapshots[command_payload.snapshot.name] = command_payload.snapshot
-
-    wap_id = evaluator.evaluate(
-        command_payload.snapshot,
-        start=command_payload.start,
-        end=command_payload.end,
-        execution_time=command_payload.execution_time,
-        snapshots=parent_snapshots,
-        deployability_index=command_payload.deployability_index,
-        batch_index=command_payload.batch_index,
-    )
-    audit_results = evaluator.audit(
-        snapshot=command_payload.snapshot,
-        start=command_payload.start,
-        end=command_payload.end,
-        execution_time=command_payload.execution_time,
-        snapshots=parent_snapshots,
-        deployability_index=command_payload.deployability_index,
-        wap_id=wap_id,
-    )
-
-    failed_audit_result = next((r for r in audit_results if r.count and r.blocking), None)
-    if failed_audit_result:
-        raise AuditError(
-            audit_name=failed_audit_result.audit.name,
-            audit_args=failed_audit_result.audit_args,
-            model=command_payload.snapshot.model_or_none,
-            count=t.cast(int, failed_audit_result.count),
-            query=t.cast(exp.Query, failed_audit_result.query),
-            adapter_dialect=evaluator.adapter.dialect,
-        )
-
-
-def promote(
-    evaluator: SnapshotEvaluator, command_payload: t.Union[str, PromoteCommandPayload]
-) -> None:
-    if isinstance(command_payload, str):
-        command_payload = PromoteCommandPayload.parse_raw(command_payload)
-    evaluator.promote(
-        command_payload.snapshots,
-        command_payload.environment_naming_info,
-        deployability_index=command_payload.deployability_index,
-    )
-
-
-def demote(
-    evaluator: SnapshotEvaluator, command_payload: t.Union[str, DemoteCommandPayload]
-) -> None:
-    if isinstance(command_payload, str):
-        command_payload = DemoteCommandPayload.parse_raw(command_payload)
-    evaluator.demote(
-        command_payload.snapshots,
-        command_payload.environment_naming_info,
-    )
-
-
-def cleanup(
-    evaluator: SnapshotEvaluator, command_payload: t.Union[str, CleanupCommandPayload]
-) -> None:
-    if isinstance(command_payload, str):
-        command_payload = CleanupCommandPayload.parse_raw(command_payload)
-
-    cleanup_expired_views(evaluator.adapter, evaluator.adapters, command_payload.environments)
-    evaluator.cleanup(command_payload.tasks)
-
-
-def create_tables(
-    evaluator: SnapshotEvaluator,
-    command_payload: t.Union[str, CreateTablesCommandPayload],
-) -> None:
-    if isinstance(command_payload, str):
-        command_payload = CreateTablesCommandPayload.parse_raw(command_payload)
-
-    snapshots_by_id = {s.snapshot_id: s for s in command_payload.snapshots}
-    target_snapshots = [snapshots_by_id[sid] for sid in command_payload.target_snapshot_ids]
-    evaluator.create(
-        target_snapshots,
-        snapshots_by_id,
-        deployability_index=command_payload.deployability_index,
-        allow_destructive_snapshots=command_payload.allow_destructive_snapshots,
-    )
-
-
-def migrate_tables(
-    evaluator: SnapshotEvaluator,
-    command_payload: t.Union[str, MigrateTablesCommandPayload],
-) -> None:
-    if isinstance(command_payload, str):
-        command_payload = MigrateTablesCommandPayload.parse_raw(command_payload)
-    snapshots_by_id = {s.snapshot_id: s for s in command_payload.snapshots}
-    target_snapshots = [snapshots_by_id[sid] for sid in command_payload.target_snapshot_ids]
-    evaluator.migrate(
-        target_snapshots, snapshots_by_id, command_payload.allow_destructive_snapshots
-    )
-
-
-COMMAND_HANDLERS: t.Dict[CommandType, t.Callable[[SnapshotEvaluator, str], None]] = {
-    CommandType.EVALUATE: evaluate,
-    CommandType.PROMOTE: promote,
-    CommandType.DEMOTE: demote,
-    CommandType.CLEANUP: cleanup,
-    CommandType.CREATE_TABLES: create_tables,
-    CommandType.MIGRATE_TABLES: migrate_tables,
-}

sqlmesh/engines/spark/app.py

@@ -1,114 +0,0 @@
-import argparse
-import logging
-import os
-import tempfile
-
-from pyspark import SparkFiles
-from pyspark.sql import SparkSession
-
-from sqlmesh.core.engine_adapter import create_engine_adapter
-from sqlmesh.core.snapshot import SnapshotEvaluator
-from sqlmesh.engines import commands
-from sqlmesh.engines.spark.db_api import spark_session as spark_session_db
-from sqlmesh.engines.spark.db_api.errors import NotSupportedError
-from sqlmesh.utils.errors import SQLMeshError
-
-logger = logging.getLogger(__name__)
-
-
-def get_or_create_spark_session(dialect: str) -> SparkSession:
-    if dialect == "databricks":
-        spark = SparkSession.getActiveSession()
-        if not spark:
-            raise SQLMeshError("Could not find an active SparkSession.")
-        return spark
-    return (
-        SparkSession.builder.config("spark.scheduler.mode", "FAIR")
-        .enableHiveSupport()
-        .getOrCreate()
-    )
-
-
-def main(
-    dialect: str,
-    default_catalog: str,
-    command_type: commands.CommandType,
-    ddl_concurrent_tasks: int,
-    payload_path: str,
-) -> None:
-    if dialect not in ("databricks", "spark"):
-        raise NotSupportedError(
-            f"Dialect '{dialect}' not supported. Must be either 'databricks' or 'spark'"
-        )
-    logging.basicConfig(
-        format="%(name)s - %(levelname)s - %(message)s (%(filename)s:%(lineno)d)",
-        level=logging.INFO,
-    )
-    command_handler = commands.COMMAND_HANDLERS.get(command_type)
-    if not command_handler:
-        raise NotSupportedError(f"Command '{command_type.value}' not supported")
-
-    spark = get_or_create_spark_session(dialect)
-
-    evaluator = SnapshotEvaluator(
-        create_engine_adapter(
-            lambda: spark_session_db.connection(spark),
-            dialect,
-            default_catalog=default_catalog,
-            multithreaded=ddl_concurrent_tasks > 1,
-            execute_log_level=logging.INFO,
-        ),
-        ddl_concurrent_tasks=ddl_concurrent_tasks,
-    )
-    if dialect == "spark":
-        with open(SparkFiles.get(payload_path), "r", encoding="utf-8") as payload_fd:
-            command_payload = payload_fd.read()
-    else:
-        from pyspark.dbutils import DBUtils  # type: ignore
-
-        dbutils = DBUtils(spark)
-        with tempfile.TemporaryDirectory() as tmp:
-            local_payload_path = os.path.join(tmp, commands.COMMAND_PAYLOAD_FILE_NAME)
-            dbutils.fs.cp(payload_path, f"file://{local_payload_path}")
-            with open(local_payload_path, "r", encoding="utf-8") as payload_fd:
-                command_payload = payload_fd.read()
-    logger.info("Command payload:\n %s", command_payload)
-    command_handler(evaluator, command_payload)
-
-    evaluator.close()
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="SQLMesh Spark Submit App")
-    parser.add_argument(
-        "--dialect",
-        help="The dialect to use when creating the engine adapter.",
-    )
-    parser.add_argument(
-        "--default_catalog",
-        help="The default catalog to use when creating the engine adapter.",
-    )
-    parser.add_argument(
-        "--command_type",
-        type=commands.CommandType,
-        choices=list(commands.CommandType),
-        help="The type of command that is being run",
-    )
-    parser.add_argument(
-        "--ddl_concurrent_tasks",
-        type=int,
-        default=1,
-        help="The number of ddl concurrent tasks to use. Default to 1.",
-    )
-    parser.add_argument(
-        "--payload_path",
-        help="Path to the payload object. Can be a local or remote path.",
-    )
-    args = parser.parse_args()
-    main(
-        args.dialect,
-        args.default_catalog,
-        args.command_type,
-        args.ddl_concurrent_tasks,
-        args.payload_path,
-    )