fix

legout · Aug 22, 2024 · 408b393 · 408b393
1 parent 45f12d8
commit 408b393
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 180 deletions.
diff --git a/examples/hello_world2/README.md b/examples/hello_world2/README.md
diff --git a/examples/hello_world2/conf/pipeline.yml b/examples/hello_world2/conf/pipeline.yml
diff --git a/examples/hello_world2/conf/scheduler.yml b/examples/hello_world2/conf/scheduler.yml
diff --git a/examples/hello_world2/conf/tracker.yml b/examples/hello_world2/conf/tracker.yml
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,7 +24,7 @@ keywords = [
 name = "FlowerPower"
 readme = "README.md"
 requires-python = ">= 3.11"
-version = "0.5.1.3"
+version = "0.5.2"
 
 [project.scripts]
 flowerpower = "flowerpower.cli:app"
@@ -75,4 +75,5 @@ exclude = [
   "src/flowerpower.egg-info",
   "src/flowerpower/__pycache__",
   "docker",
+  ".gitignore",
 ]
diff --git a/src/flowerpower/cfg.py b/src/flowerpower/cfg.py
@@ -47,7 +47,7 @@ def write(self) -> None:
         with open(self._path, "w") as f:
             f.write(
                 eval(f"{self.name.upper()}_TEMPLATE")
-                + yaml.dump(unmunchify(self._cfg), sort_keys=False).replace("null", "")
+                + yaml.dump(unmunchify(self._cfg), sort_keys=False).replace("null", "").replace("{}","")
             )
 
     def update(self, cfg: dict | Munch) -> None:
@@ -82,7 +82,7 @@ def __init__(self, base_dir: str | None = None) -> None:
         super().__init__(self.name, base_dir)
 
         self.load()
-        self._cfg = self._cfg or self.init_cfg
+        self._cfg = self._cfg or munchify(self.init_cfg)
 
 
 class SchedulerConfig(BaseConfig):
@@ -98,24 +98,25 @@ def __init__(self, base_dir: str | None = None) -> None:
         super().__init__(self.name, base_dir)
 
         self.load()
-        self._cfg = self._cfg or self.init_cfg
+        self._cfg = self._cfg or munchify(self.init_cfg)
 
 
 class PipelineConfig(BaseConfig):
     name = "pipeline"
     init_cfg = {
-        "run": {
-            "dev": {"inputs": None, "final_vars": None, "with_tracker": False},
-            "prod": {"inputs": None, "final_vars": None, "with_tracker": True},
-        },
+        "run": {},
+        #{
+        #    "dev": {"inputs": None, "final_vars": None, "with_tracker": False},
+        #    "prod": {"inputs": None, "final_vars": None, "with_tracker": True},
+        #},
         "params": {},
     }
 
     def __init__(self, base_dir: str | None = None) -> None:
         super().__init__(self.name, base_dir)
 
         self.load()
-        self._cfg = self._cfg or self.init_cfg
+        self._cfg = self._cfg or munchify(self.init_cfg)
 
     def _to_ht_params(self, d: dict, parent_dict: dict | None = None):
         """

diff --git a/src/flowerpower/pipeline.py b/src/flowerpower/pipeline.py
@@ -535,6 +535,11 @@ def add(
             )
         logger.info(f"Created pipeline module {name}.py")
 
+        run = run or {
+            "dev": {"final_vars": [], "inputs": {}},
+            "prod": {"final_vars": [], "inputs": {}},
+        }
+
         self.cfg.update({"run": {name: run}, "params": {name: params}}, name="pipeline")
         logger.info(f"Updated pipeline configuration {self._conf_dir}/pipeline.yml")
         self.cfg.update({"pipeline": {name: schedule}}, name="scheduler")