Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion metrics_layer/cli/seeding.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ def __init__(
}

def seed(self, auto_tag_searchable_fields: bool = False, tag_default_date: bool = True):
from metrics_layer.core.exceptions import ConfigError
from metrics_layer.core.model.project import Project
from metrics_layer.core.parse import ProjectDumper, ProjectLoader

if self.connection.type not in Definitions.supported_warehouses:
Expand Down Expand Up @@ -285,7 +287,11 @@ def seed(self, auto_tag_searchable_fields: bool = False, tag_default_date: bool
table_data = table_data[table_data["TABLE_NAME"].str.lower() == self.table.lower()].copy()
folder = self._location()
loader = ProjectLoader(folder)
project = loader.load()
try:
project = loader.load()
except ConfigError:
# No zenlytic_project.yml yet — seeding will create it
project = Project(models=[], views=[])

current_models = project.models()

Expand Down
4 changes: 4 additions & 0 deletions metrics_layer/core/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ def __str__(self):

class JoinError(QueryError):
pass


class ConfigError(MetricsLayerException):
pass
6 changes: 1 addition & 5 deletions metrics_layer/core/parse/project_loader.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

from metrics_layer.core.exceptions import MetricsLayerException
from metrics_layer.core.exceptions import ConfigError, MetricsLayerException # noqa: F401
from metrics_layer.core.model.project import Project
from metrics_layer.core.parse.connections import BaseConnection, connection_class_lookup

Expand All @@ -11,10 +11,6 @@
from .project_reader_metrics_layer import MetricsLayerProjectReader


class ConfigError(MetricsLayerException):
pass


class ProjectLoader:
def __init__(self, location: str, branch: str = "master", connections: list = [], **kwargs):
self.kwargs = kwargs
Expand Down
13 changes: 12 additions & 1 deletion metrics_layer/core/parse/project_reader_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import ruamel.yaml

from metrics_layer.core.exceptions import MetricsLayerException
from metrics_layer.core.exceptions import ConfigError, MetricsLayerException

from .github_repo import BaseRepo

Expand Down Expand Up @@ -58,6 +58,17 @@ def dbt_folder(self):

def get_folders(self, key: str, default: str = None, raise_errors: bool = True):
if not self.zenlytic_project:
if raise_errors:
searched_paths = [
os.path.join(self.repo.folder, "zenlytic_project.yml"),
os.path.join(self.dbt_folder, "zenlytic_project.yml"),
]
raise ConfigError(
"Could not find zenlytic_project.yml. Searched in:\n"
+ "\n".join(f" - {p}" for p in searched_paths)
+ "\nPlease ensure your repository contains a valid zenlytic_project.yml file. "
"Learn more here: https://docs.zenlytic.com"
)
return []

if key in self.zenlytic_project:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "metrics_layer"
version = "0.16.34"
version = "0.16.35"
description = "The open source metrics layer."
authors = ["Paul Blankley <paul@zenlytic.com>"]
keywords = ["Metrics Layer", "Business Intelligence", "Analytics"]
Expand Down
32 changes: 30 additions & 2 deletions tests/test_config_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ def __init__(self, repo_type: str = None):
def folder(self):
if self.repo_type == "dbt":
return os.path.join(BASE_PATH, "config/dbt/")
return os.path.join(BASE_PATH, "config/metrics_layer/")
if self.repo_type == "metricflow":
return os.path.join(BASE_PATH, "config/metricflow/")
return os.path.join(BASE_PATH, "config/metrics_layer_config/")

@property
def warehouse_type(self):
Expand Down Expand Up @@ -55,8 +57,34 @@ def mock_dbt_search(pattern):
return []


class repo_mock_no_project_file(BaseRepo):
def __init__(self, tmp_path):
self.repo_type = None
self.dbt_path = None
self._folder = str(tmp_path)

@property
def folder(self):
return self._folder

def fetch(self, private_key=None):
return

def search(self, pattern, folders):
return []

def delete(self):
return


def test_missing_zenlytic_project_file_raises_config_error(tmp_path):
reader = MetricsLayerProjectReader(repo=repo_mock_no_project_file(tmp_path))
with pytest.raises(ConfigError, match="Could not find zenlytic_project.yml"):
reader.load()


def test_get_branch_options():
loader = MetricsLayerConnection(location=os.path.join(BASE_PATH, "config/metrics_layer/"))
loader = MetricsLayerConnection(location=os.path.join(BASE_PATH, "config/metrics_layer_config/"))
loader.load()
assert loader.get_branch_options() == []

Expand Down
Loading