splight-cli 4.6.0.dev1__tar.gz → 4.6.1__tar.gz

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-cli
-Version: 4.6.0.dev1
+Version: 4.6.1
 Summary: Splight Command Line Interface
 Author: Splight Dev
 Author-email: dev@splight-ae.com
@@ -19,16 +19,21 @@ Requires-Dist: deepdiff (==6.3.1)
 Requires-Dist: mock (>=5.1.0,<6.0.0)
 Requires-Dist: packaging (==23.0)
 Requires-Dist: pathspec (==0.11.1)
-Requires-Dist: py7zr (==0.18.5)
-Requires-Dist: requests (==2.27.1)
+Requires-Dist: py7zr (==0.20.8)
+Requires-Dist: requests (==2.31.0)
 Requires-Dist: rich (==13.0.1)
 Requires-Dist: setuptools (==60.9.3)
-Requires-Dist: splight-lib (==4.4.0)
+Requires-Dist: splight-lib (==4.6.3)
 Requires-Dist: typer (==0.7.0)
 Description-Content-Type: text/markdown
 
 # Splight CLI
 
+![snyk_code](https://github.com/splightplatform/splight-cli/blob/gh-pages/snyk_code.svg?raw=True)
+![snyk_dependencies](https://github.com/splightplatform/splight-cli/blob/gh-pages/snyk_dependencies.svg?raw=True)
+
+---
+
 ## Table of Content
 
 - [Splight CLI](#splight-cli)

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/README.md

@@ -1,5 +1,10 @@
 # Splight CLI
 
+![snyk_code](https://github.com/splightplatform/splight-cli/blob/gh-pages/snyk_code.svg?raw=True)
+![snyk_dependencies](https://github.com/splightplatform/splight-cli/blob/gh-pages/snyk_dependencies.svg?raw=True)
+
+---
+
 ## Table of Content
 
 - [Splight CLI](#splight-cli)

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-cli"
-version = "4.6.0.dev1"
+version = "4.6.1"
 description = "Splight Command Line Interface"
 authors = ["Splight Dev <dev@splight-ae.com>"]
 readme = "README.md"
@@ -11,11 +11,11 @@ case-converter = "1.1.0"
 click = "8.0.4"
 click-default-group = "1.2.2"
 setuptools = "60.9.3"
-splight-lib = "4.4.0"
-py7zr = "0.18.5"
+splight-lib = "4.6.3"
+py7zr = "0.20.8"
 typer = "0.7.0"
 colorama = "0.4.4"
-requests = "2.27.1"
+requests = "2.31.0"
 PyYAML = "6.0.1"
 rich = "13.0.1"
 pathspec = "0.11.1"

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/apply_exec.py

@@ -115,7 +115,7 @@ class ApplyExecutor:
             )
             if diff:
                 bprint(
-                    f"\nThe remote {model_name} with id {instance_id} has the "
+                    f"\nThe remote {model_name} with id {instance_id} has the"
                     " following differences with the local item:"
                 )
                 rprint(diff)

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/importer.py

@@ -3,6 +3,7 @@ from uuid import UUID
 
 from rich.console import Console
 from splight_lib.models import (
+    Alert,
     Asset,
     Component,
     Function,
@@ -31,6 +32,7 @@ class ImporterExecutor:
             "secret": Secret,
             "component": Component,
             "function": Function,
+            "alert": Alert,
         }
 
     def import_element(self, element: ElementType, id: UUID) -> ImportResult:

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/models.py

@@ -2,7 +2,14 @@ from enum import Enum
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
-from splight_lib.models import Asset, File, Function, RoutineObject, Secret
+from splight_lib.models import (
+    Alert,
+    Asset,
+    File,
+    Function,
+    RoutineObject,
+    Secret,
+)
 from splight_lib.models.component import Component as LibComponent
 
 
@@ -11,6 +18,7 @@ class ElementType(str, Enum):
     secret = "secret"
     component = "component"
     function = "function"
+    alert = "alert"
 
 
 class Component(LibComponent):
@@ -23,12 +31,14 @@ class PlanSolution(BaseModel):
     files: List[File]
     components: List[Component]
     functions: List[Function]
+    alerts: List[Alert]
     imported_assets: Optional[List[Asset]] = Field(default_factory=list)
     imported_secrets: Optional[List[Secret]] = Field(default_factory=list)
     imported_components: Optional[List[Component]] = Field(
         default_factory=list
     )
     imported_functions: Optional[List[Function]] = Field(default_factory=list)
+    imported_alerts: Optional[List[Alert]] = Field(default_factory=list)
 
 
 class StateSolution(PlanSolution):

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/plan_exec.py

@@ -30,6 +30,29 @@ class PlanExecutor:
                 "If the plan is applied the following Asset will be deleted:"
             )
             bprint(asset)
+        for secret in check_results.secrets_to_delete:
+            bprint(
+                "If the plan is applied the following Secret will be "
+                "deleted:"
+            )
+            bprint(secret)
+        for file in check_results.files_to_delete:
+            bprint(
+                "If the plan is applied the following File will be " "deleted:"
+            )
+            bprint(file)
+        for function in check_results.functions_to_delete:
+            bprint(
+                "If the plan is applied the following Function will be "
+                "deleted:"
+            )
+            bprint(function)
+        for alert in check_results.alerts_to_delete:
+            bprint(
+                "If the plan is applied the following alert will be "
+                "deleted:"
+            )
+            bprint(alert)
         for component in check_results.components_to_delete:
             bprint(
                 "If the plan is applied the following Component will be "

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/replacer.py

@@ -1,6 +1,7 @@
 import json
 from typing import Callable, Dict, List, Optional, Union
 
+from splight_lib.models import AlertItem, QueryFilter
 from splight_lib.models.component import (
     InputDataAddress,
     InputParameter,
@@ -36,6 +37,10 @@ class Replacer:
             file_ref = get_ref_str("file", file.name)
             self._reference_map[file_ref] = file.id
 
+        for secret in self._state.secrets:
+            secret_ref = get_ref_str("secret", secret.name)
+            self._reference_map[secret_ref] = f"${{{{SECRET.{secret.name}}}}}"
+
     def replace_references(self):
         """Replaces any references in the inputs, outputs and routines of every
         component.
@@ -66,6 +71,14 @@ class Replacer:
                 target_attribute=state_functions[i].target_attribute
             )
 
+        state_alerts = self._state.alerts
+        for i in range(len(state_alerts)):
+            alert_items = state_alerts[i].alert_items
+            for j in range(len(alert_items)):
+                self._replace_alert_ref(alert_item=alert_items[j])
+
+            self._replace_alert_ref(assets=state_alerts[i].assets)
+
     def _replace_io_ref(
         self,
         io_elem: Union[InputDataAddress, InputParameter, Output],
@@ -156,6 +169,54 @@ class Replacer:
             value_ref = target_attribute["id"]
             target_attribute["id"] = self._parse_input_output(value_ref)
 
+    def _replace_alert_ref(
+        self, alert_item: AlertItem = None, assets: QueryFilter = None
+    ):
+        """Replaces references in the alert_item and assets.
+
+        Parameters
+        ----------
+        alert_item : Optional[AlertItem]
+            The alert item to be processed. Default None.
+        assets : Optional[List[QueryFilter]]
+            List of assets to be processed. Default None.
+        """
+        if alert_item:
+            asset = alert_item.query_filter_asset
+            attribute = alert_item.query_filter_attribute
+            query_plain = alert_item.query_plain
+
+            if asset:
+                value_ref = asset["id"]
+                asset["id"] = self._parse_input_output(value_ref)
+                alert_item.query_filter_asset = asset
+
+            if attribute:
+                value_ref = attribute["id"]
+                attribute["id"] = self._parse_input_output(value_ref)
+                alert_item.query_filter_attribute = attribute
+
+            if query_plain:
+                query_dict = json.loads(query_plain)
+
+                # NOTE: sadly this depends on the query.
+                # I'd rather do this than black magic to get the placeholders.
+                asset_ref = query_dict[0]["$match"]["asset"]
+                attribute_ref = query_dict[0]["$match"]["attribute"]
+
+                query_dict[0]["$match"]["asset"] = self._parse_input_output(
+                    asset_ref
+                )
+                query_dict[0]["$match"][
+                    "attribute"
+                ] = self._parse_input_output(attribute_ref)
+                alert_item.query_plain = json.dumps(query_dict)
+
+        if assets:
+            for asset in assets:
+                value_ref = asset["id"]
+                asset["id"] = self._parse_input_output(value_ref)
+
     def _get_new_value(
         self,
         elem: Union[InputDataAddress, InputParameter, Output],
@@ -273,6 +334,12 @@ class Replacer:
         elif attr_ref not in self._reference_map:
             missing_ref = attr_ref
 
+        if missing_ref is not None:
+            raise UndefinedID(
+                f"The reference '{missing_ref}' "
+                f"used in the routine named '{routine_name}' of the "
+                f"component '{component_name}' is not a valid reference."
+            )
         if self._attr_to_asset_map[attr_ref] != asset_ref:
             raise UndefinedID(
                 f"The attribute '{attr_ref}' is not an attribute of "
@@ -280,12 +347,6 @@ class Replacer:
                 f"'{routine_name}' of the component '{component_name}'."
             )
 
-        if missing_ref is not None:
-            raise UndefinedID(
-                f"The reference '{missing_ref}' "
-                f"used in the routine named '{routine_name}' of the "
-                f"component '{component_name}' is not a valid reference."
-            )
         return {
             "asset": self._reference_map[asset_ref],
             "attribute": self._reference_map[attr_ref],

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/solution.py

@@ -6,6 +6,7 @@ import typer
 from pydantic import ValidationError
 from rich.console import Console
 from splight_lib.models import (
+    Alert,
     Asset,
     Component,
     File,
@@ -62,6 +63,8 @@ class SolutionManager:
                 r"root\['config'\]\[\d+\]\['description'\]",
                 r"root\['input'\]\[\d+\]\['description'\]",
                 r"root\['output'\]\[\d+\]\['description'\]",
+                # NOTE: API returns the DataAddress type but we don't use it
+                r"root\['(?:input|output)'\]\[\d+\]\['value'\]\['type'\]",
             ],
             File.__name__: [
                 r"root\['metadata'\]",
@@ -83,13 +86,14 @@ class SolutionManager:
         console.print("\nStarting apply...", style=PRINT_STYLE)
         check_result = self._solution_checker.check()
         self._plan, self._state = check_result.plan, check_result.state
-        self._delete_assets_and_components(check_result)
+        self._delete_objects(check_result)
         self._apply_assets_state()
         self._apply_secrets_state()
         self._apply_files_state()
         self._replacer.build_reference_map()
         self._replacer.replace_references()
         self._apply_functions_state()
+        self._apply_alerts_state()
         self._apply_components_state()
 
     def plan(self):
@@ -99,10 +103,12 @@ class SolutionManager:
         self._plan_exec.plan_elements_to_delete(check_result)
         self._plan_assets_state()
         self._plan_secrets_state()
+        # TODO: buscar los files en una carpeta fija
         self._plan_files_state()
         self._replacer.build_reference_map()
         self._replacer.replace_references()
         self._plan_functions_state()
+        self._plan_alerts_state()
         self._plan_components_state()
 
     def import_element(self, element: ElementType, id: UUID):
@@ -155,12 +161,20 @@ class SolutionManager:
 
         state_functions = self._state.functions
         for idx in range(len(state_functions) - 1, -1, -1):
-            function_to_detele = state_functions[idx]
-            destroyed = self._destroyer.destroy(Function, function_to_detele)
+            function_to_delete = state_functions[idx]
+            destroyed = self._destroyer.destroy(Function, function_to_delete)
             if destroyed:
                 state_functions.pop(idx)
                 save_yaml(self._state_path, self._state)
 
+        state_alerts = self._state.alerts
+        for idx in range(len(state_alerts) - 1, -1, -1):
+            alert_to_delete = state_alerts[idx]
+            destroyed = self._destroyer.destroy(Alert, alert_to_delete)
+            if destroyed:
+                state_alerts.pop(idx)
+                save_yaml(self._state_path, self._state)
+
         state_components = self._state.components
         for idx in range(len(state_components) - 1, -1, -1):
             component_to_delete = state_components[idx]
@@ -176,8 +190,16 @@ class SolutionManager:
                 return StateSolution.model_validate(
                     load_yaml(self._state_path)
                 )
-            except ValidationError:
-                pass
+            except ValidationError as exc:
+                raise typer.Abort(
+                    f"Validation error while opening '{self._state_path}': {exc}"
+                )
+            except FileNotFoundError as exc:
+                raise typer.Abort(f"File '{self._state_path}' not found.")
+            except:
+                raise typer.Abort(
+                    f"Unkown error while opening file '{self._state_path}'"
+                )
         else:
             self._state_path = self._plan_path.parent / DEFAULT_STATE_PATH
 
@@ -232,7 +254,12 @@ class SolutionManager:
         for state_function in function_list:
             self._plan_exec.plan_elem_state(Function, state_function)
 
-    def _delete_assets_and_components(self, check_result: CheckResult):
+    def _plan_alerts_state(self):
+        alert_list = self._state.alerts + self._state.imported_alerts
+        for state_alert in alert_list:
+            self._plan_exec.plan_elem_state(Alert, state_alert)
+
+    def _delete_objects(self, check_result: CheckResult):
         """Deletes assets and/or components that have been removed from the
         plan.
 
@@ -245,6 +272,22 @@ class SolutionManager:
             self._apply_exec.delete(Asset, asset)
             save_yaml(self._state_path, self._state)
 
+        for secret in check_result.secrets_to_delete:
+            self._apply_exec.delete(Secret, secret)
+            save_yaml(self._state_path, self._state)
+
+        for file in check_result.files_to_delete:
+            self._apply_exec.delete(File, file)
+            save_yaml(self._state_path, self._state)
+
+        for function in check_result.functions_to_delete:
+            self._apply_exec.delete(Function, function)
+            save_yaml(self._state_path, self._state)
+
+        for alert in check_result.alerts_to_delete:
+            self._apply_exec.delete(Alert, alert)
+            save_yaml(self._state_path, self._state)
+
         for component in check_result.components_to_delete:
             self._apply_exec.delete(Component, component)
             save_yaml(self._state_path, self._state)
@@ -275,9 +318,7 @@ class SolutionManager:
 
     def _apply_secrets_state(self):
         """Applies secrets states to the engine."""
-        secrets_list = (
-            self._state.secrets
-        )  # TODO: a chequear + self._state.imported_secrets
+        secrets_list = self._state.secrets
         for i in range(len(secrets_list)):
             result = self._apply_exec.apply(
                 model=Secret, local_instance=secrets_list[i]
@@ -362,7 +403,7 @@ class SolutionManager:
         return routine_list
 
     def _apply_functions_state(self):
-        """Applies RoutineObject states to the engine."""
+        """Applies Function states to the engine."""
         functions_list = self._state.functions
         for i in range(len(functions_list)):
             result = self._apply_exec.apply(
@@ -375,6 +416,44 @@ class SolutionManager:
                 )
                 save_yaml(self._state_path, self._state)
 
+        imported_functions_list = self._state.imported_functions
+        for i in range(len(imported_functions_list)):
+            result = self._apply_exec.apply(
+                model=Function,
+                local_instance=imported_functions_list[i],
+                not_found_is_exception=True,
+            )
+            if result.update:
+                imported_functions_list[i] = Function.model_validate(
+                    result.updated_dict
+                )
+                save_yaml(self._state_path, self._state)
+
+    def _apply_alerts_state(self):
+        """Applies Alert states to the engine."""
+        alerts_list = self._state.alerts
+        for i in range(len(alerts_list)):
+            result = self._apply_exec.apply(
+                model=Alert,
+                local_instance=alerts_list[i],
+            )
+            if result.update:
+                alerts_list[i] = Alert.model_validate(result.updated_dict)
+                save_yaml(self._state_path, self._state)
+
+        imported_alerts_list = self._state.imported_alerts
+        for i in range(len(imported_alerts_list)):
+            result = self._apply_exec.apply(
+                model=Alert,
+                local_instance=imported_alerts_list[i],
+                not_found_is_exception=True,
+            )
+            if result.update:
+                imported_alerts_list[i] = Alert.model_validate(
+                    result.updated_dict
+                )
+                save_yaml(self._state_path, self._state)
+
     def _apply_files_state(self):
         """Applies Files states to the engine."""
         files_list = self._state.files

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/solution_checker.py

@@ -3,6 +3,8 @@ from typing import Callable, List, Type
 
 from rich.console import Console
 from splight_lib.models import (
+    Alert,
+    AlertItem,
     Asset,
     Attribute,
     File,
@@ -11,6 +13,8 @@ from splight_lib.models import (
     RoutineObject,
     Secret,
 )
+from splight_lib.models.alert import AlertThreshold
+from splight_lib.models.asset import GeometryCollection
 
 from splight_cli.solution.exceptions import ElemnentAlreadyDefined
 from splight_cli.solution.models import Component
@@ -23,7 +27,8 @@ CheckResult = namedtuple(
         "secrets_to_delete",
         "files_to_delete",
         "components_to_delete",
-        "functions_to_detele",
+        "functions_to_delete",
+        "alerts_to_delete",
         "plan",
         "state",
     ),
@@ -87,6 +92,18 @@ class SolutionChecker:
             Function.__name__,
             self._update_function,
         )
+        alerts_to_delete = self._check_elements(
+            self._plan.alerts,
+            self._state.alerts,
+            Alert.__name__,
+            self._update_alert,
+        )
+        alerts_to_delete += self._check_elements(
+            self._plan.imported_alerts,
+            self._state.imported_alerts,
+            Alert.__name__,
+            self._update_alert,
+        )
         components_to_delete = self._check_elements(
             self._plan.components,
             self._state.components,
@@ -105,7 +122,8 @@ class SolutionChecker:
             secrets_to_delete=secrets_to_delete,
             files_to_delete=files_to_delete,
             components_to_delete=components_to_delete,
-            functions_to_detele=functions_to_delete,
+            functions_to_delete=functions_to_delete,
+            alerts_to_delete=alerts_to_delete,
             plan=self._plan,
             state=self._state,
         )
@@ -186,7 +204,9 @@ class SolutionChecker:
             Updated asset.
         """
         plan_asset_dict = plan_asset.model_dump(
-            exclude={"attributes"}, exclude_none=True, exclude_unset=True
+            exclude={"attributes", "geomtry"},
+            exclude_none=True,
+            exclude_unset=True,
         )
         state_asset = state_asset.model_copy(update=plan_asset_dict)
         self._check_elements(
@@ -195,6 +215,8 @@ class SolutionChecker:
             Attribute.__name__,
             self._update_attribute,
         )
+        if geometry := plan_asset_dict.get("geometry", {}):
+            state_asset.geometry = GeometryCollection.model_validate(geometry)
         return state_asset
 
     def _update_attribute(
@@ -227,9 +249,9 @@ class SolutionChecker:
 
         Parameters
         ----------
-        plan_secret : secret
+        plan_secret : Secret
             Plan secret.
-        state_secret : secret
+        state_secret : Secret
             State secret to be updated based on the plan secret.
 
         Returns
@@ -353,3 +375,35 @@ class SolutionChecker:
             exclude_unset=True,
         )
         return state_function_item.model_copy(update=plan_function_item_dict)
+
+    def _update_alert(self, plan_alert: Alert, state_alert: Alert):
+        plan_alert_dict = plan_alert.model_dump(
+            exclude_none=True, exclude_unset=True, exclude={"alert_items"}
+        )
+        state_alert = state_alert.model_copy(update=plan_alert_dict)
+
+        state_alert.stmt_thresholds = []
+        for threshold in plan_alert_dict["stmt_thresholds"]:
+            state_alert.stmt_thresholds.append(
+                AlertThreshold.model_validate(threshold)
+            )
+
+        self._check_elements(
+            plan_alert.alert_items,
+            state_alert.alert_items,
+            AlertItem.__name__,
+            self._update_alert_item,
+            accesor="ref_id",
+        )
+        return state_alert
+
+    def _update_alert_item(
+        self,
+        plan_alert_item: AlertItem,
+        state_alert_item: AlertItem,
+    ):
+        plan_alert_item_dict = plan_alert_item.model_dump(
+            exclude_none=True,
+            exclude_unset=True,
+        )
+        return state_alert_item.model_copy(update=plan_alert_item_dict)

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/tests/constants.py

@@ -4,6 +4,10 @@ from splight_cli.solution.solution import StateSolution
 from splight_cli.solution.utils import to_dict
 
 TEST_PLAN = {
+    "secrets": [],
+    "files": [],
+    "functions": [],
+    "alerts": [],
     "assets": [
         {
             "attributes": [
@@ -171,8 +175,8 @@ TEST_PLAN = {
                             "sensitive": False,
                             "type": "DataAddress",
                             "value": {
-                                "asset": "local.{{test_asset}}",
-                                "attribute": "attr_1",
+                                "asset": f"asset.{{{{test_asset}}}}",
+                                "attribute": f"asset.{{{{test_asset}}}}.attribute.{{{{attr_1}}}}",
                             },
                             "value_type": "Number",
                         },
@@ -199,12 +203,12 @@ TEST_PLAN = {
                             "type": "DataAddress",
                             "value": [
                                 {
-                                    "asset": "local.{{test_asset}}",
-                                    "attribute": "attr_2",
+                                    "asset": f"asset.{{{{test_asset}}}}",
+                                    "attribute": f"asset.{{{{test_asset}}}}.attribute.{{{{attr_2}}}}",
                                 },
                                 {
-                                    "asset": "local.{{test_asset}}",
-                                    "attribute": "attr_3",
+                                    "asset": f"asset.{{{{test_asset}}}}",
+                                    "attribute": f"asset.{{{{test_asset}}}}.attribute.{{{{attr_3}}}}",
                                 },
                             ],
                             "value_type": "Number",
@@ -222,8 +226,8 @@ TEST_PLAN = {
                             "sensitive": False,
                             "type": "DataAddress",
                             "value": {
-                                "asset": "local.{{test_asset}}",
-                                "attribute": "attr_4",
+                                "asset": f"asset.{{{{test_asset}}}}",
+                                "attribute": f"asset.{{{{test_asset}}}}.attribute.{{{{attr_4}}}}",
                             },
                             "value_type": "Number",
                         },
@@ -275,6 +279,10 @@ TEST_PLAN = {
     "imported_components": [],
 }
 TEST_STATE_FILLED = {
+    "secrets": [],
+    "files": [],
+    "functions": [],
+    "alerts": [],
     "assets": [
         {
             "attributes": [

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/tests/test_plan.py

@@ -22,8 +22,8 @@ def test_plan_print(load_yaml_mock, save_yaml_mock):
 def test_plan_raise_undefined_asset_name(load_yaml_mock, save_yaml_mock):
     plan = get_plan()
     plan["components"][0]["routines"][0]["output"][0]["value"] = {
-        "asset": "local.{{test_asset}}",
-        "attribute": "attr_5",
+        "asset": f"asset.{{{{test_asset}}}}",
+        "attribute": f"asset.{{{{test_asset}}}}.attribute.{{{{attr_5}}}}",
     }
     load_yaml_mock.side_effect = [plan, plan]
     solution_manager = SolutionManager("./dummy_path", "./dummy_path")

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/solution/utils.py

@@ -10,6 +10,7 @@ from pydantic import BaseModel
 from rich.console import Console
 from rich.style import Style
 from splight_lib.models import (
+    Alert,
     Asset,
     Component,
     File,
@@ -20,7 +21,9 @@ from splight_lib.models import (
 
 console = Console()
 
-SplightTypes = Union[Asset, Secret, Component, RoutineObject, File, Function]
+SplightTypes = Union[
+    Asset, Alert, Secret, Component, RoutineObject, File, Function
+]
 
 MatchResult = namedtuple(
     "MatchResult", ["is_id", "type", "asset", "attribute"]

{splight_cli-4.6.0.dev1 → splight_cli-4.6.1}/splight_cli/utils/template.py

@@ -15,4 +15,4 @@ def get_template(name) -> Template:
         raise MissingTemplate(f"Unable to find template {template_path}")
     with open(template_path, "r+") as f:
         content = f.read()
-    return Template(content)
+    return Template(content, autoescape=True)