Add "parent" option to profile, enabling one profile to get settings …

…from another
rhasspy · Apr 9, 2021 · 35d61e9 · 35d61e9
1 parent e31ab38
commit 35d61e9
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.0
+0.7.1
diff --git a/rhasspyprofile/profile.py b/rhasspyprofile/profile.py
@@ -95,8 +95,13 @@ def load_profile(self) -> None:
         # Load just the system profile.json (on top of defaults)
         system_profile_path = self.system_profiles_dir / self.name / "profile.json"
 
-        with open(system_profile_path, "r") as system_profile_file:
-            Profile.recursive_update(self.system_json, json.load(system_profile_file))
+        if system_profile_path.is_file():
+            with open(system_profile_path, "r") as system_profile_file:
+                Profile.recursive_update(
+                    self.system_json, json.load(system_profile_file)
+                )
+        else:
+            _LOGGER.warning("No system profile found for %s", self.name)
 
         # Overlay with profile
         self.json_path = self.read_path("profile.json")
@@ -116,6 +121,46 @@ def load_profile(self) -> None:
                         with open(json_path, "r") as profile_file:
                             profile_json = json5.load(profile_file)
 
+                    # Check for parent profile
+                    parent_name = profile_json.get("parent")
+                    if parent_name:
+                        # Load parent profile first
+                        for parent_profiles_dir in self.profiles_dirs[::-1]:
+                            parent_json_path = (
+                                parent_profiles_dir / parent_name / "profile.json"
+                            )
+                            _LOGGER.debug("Loading %s", parent_json_path)
+                            if parent_json_path.is_file():
+                                try:
+                                    with open(
+                                        parent_json_path, "r"
+                                    ) as parent_profile_file:
+                                        parent_profile_json = json.load(
+                                            parent_profile_file
+                                        )
+                                except Exception as e:
+                                    _LOGGER.warning(str(e))
+
+                                    # Fall back to json5
+                                    with open(
+                                        parent_json_path, "r"
+                                    ) as parent_profile_file:
+                                        parent_profile_json = json5.load(
+                                            parent_profile_file
+                                        )
+
+                                # Update with parent profile settings
+                                Profile.recursive_update(self.json, parent_profile_json)
+
+                                # Also update the system JSON, so settings are
+                                # stored relative to the parent profile.
+                                Profile.recursive_update(
+                                    self.system_json, parent_profile_json
+                                )
+
+                    # ---------------------------------------------------------
+
+                    # Update with local profile settings
                     Profile.recursive_update(self.json, profile_json)
 
     def read_path(self, *path_parts: str) -> Path:

diff --git a/rhasspyprofile/profiles/defaults.json b/rhasspyprofile/profiles/defaults.json
@@ -100,6 +100,7 @@
     "lang": null
   },
   "language": "",
+  "parent": "",
   "microphone": {
     "satellite_site_ids": "",
     "arecord": {