splight-cli 4.11.2__tar.gz → 4.12.0__tar.gz

{splight_cli-4.11.2 → splight_cli-4.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-cli
-Version: 4.11.2
+Version: 4.12.0
 Summary: Splight Command Line Interface
 Author: Splight Dev
 Author-email: dev@splight-ae.com
@@ -21,7 +21,7 @@ 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 (>=5,<6)
+Requires-Dist: splight-lib (>=5.6.0,<6.0.0)
 Requires-Dist: toposort (>=1.10,<2.0)
 Requires-Dist: typer (==0.9.0)
 Description-Content-Type: text/markdown

{splight_cli-4.11.2 → splight_cli-4.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-cli"
-version = "4.11.2"
+version = "4.12.0"
 description = "Splight Command Line Interface"
 authors = ["Splight Dev <dev@splight-ae.com>"]
 readme = "README.md"
@@ -11,7 +11,7 @@ case-converter = "1.1.0"
 click = "8.0.4"
 click-default-group = "1.2.2"
 setuptools = "60.9.3"
-splight-lib = "^5"
+splight-lib = "^5.6.0"
 py7zr = "0.20.8"
 typer = "0.9.0"
 colorama = "0.4.4"
@@ -32,6 +32,7 @@ pre-commit = "3.2.2"
 pytest = "^7.4.3"
 coverage = "^7.3.2"
 mock = "^5.1.0"
+ruff = "^0.3.5"
 
 [tool.poetry.scripts]
 splight = "splight_cli.cli:app"
@@ -48,6 +49,10 @@ force-exclude = ".*/component/templates/.*py"
 profile = "black"
 line_length = 79
 
+[tool.ruff]
+line-length = 79
+exclude = ["*/component/templates/*"]
+
 [tool.pytest.ini_options]
 filterwarnings = [
     "error",

{splight_cli-4.11.2 → splight_cli-4.12.0}/splight_cli/engine/asset/__init__.py

@@ -6,10 +6,7 @@ from rich.console import Console
 from splight_lib.models import Asset
 
 from splight_cli.constants import error_style
-from splight_cli.engine.manager import (
-    ResourceManager,
-    ResourceManagerException,
-)
+from splight_cli.engine.manager import ResourceManager
 
 asset_app = typer.Typer(
     name="Splight Engine Asset",

{splight_cli-4.11.2 → splight_cli-4.12.0}/splight_cli/engine/manager/__init__.py

@@ -6,3 +6,12 @@ from splight_cli.engine.manager.manager import (
     ResourceManager,
     ResourceManagerException,
 )
+
+__all__ = [
+    ComponentUpgradeManager,
+    ComponentUpgradeManagerException,
+    DatalakeManager,
+    DatalakeManagerException,
+    ResourceManager,
+    ResourceManagerException,
+]

{splight_cli-4.11.2 → splight_cli-4.12.0}/splight_cli/hub/__init__.py

@@ -2,6 +2,7 @@ import typer
 
 from splight_cli.context import check_credentials
 from splight_cli.hub.component import component_app
+from splight_cli.hub.solution import solution_app
 
 hub_app = typer.Typer(
     name="Splight Hub",
@@ -11,6 +12,7 @@ hub_app = typer.Typer(
 )
 
 hub_app.add_typer(component_app, name="component")
+hub_app.add_typer(solution_app, name="solution")
 
 
 @hub_app.callback(invoke_without_command=True)

{splight_cli-4.11.2 → splight_cli-4.12.0}/splight_cli/hub/component/__init__.py

@@ -6,7 +6,7 @@ from splight_cli.constants import error_style
 from splight_cli.hub.component.hub_manager import HubComponentManager
 
 component_app = typer.Typer(
-    name="Splight Engine Component",
+    name="Splight Hub Component",
     add_completion=True,
     rich_markup_mode="rich",
     no_args_is_help=True,

splight_cli-4.12.0/splight_cli/hub/solution/__init__.py

@@ -0,0 +1,66 @@
+from typing import List
+
+import typer
+from rich.console import Console
+from splight_lib.models import Component
+
+from splight_cli.constants import error_style
+from splight_cli.hub.solution.solution_manager import HubSolutionManager
+
+solution_app = typer.Typer(
+    name="Splight Hub Solution",
+    add_completion=True,
+    rich_markup_mode="rich",
+    no_args_is_help=True,
+)
+
+console = Console()
+MODEL = Component
+
+
+@solution_app.command()
+def push(
+    ctx: typer.Context,
+    name: str = typer.Option(..., help="The solution's name"),
+    version: str = typer.Option(..., help="The solution's version"),
+    description: str = typer.Option("", help="The solution's description"),
+    tags: List[str] = typer.Option([], help="The solution's tags"),
+    path: str = typer.Option(".", help="Path to solution files"),
+    force: bool = typer.Option(
+        False,
+        "--force",
+        "-f",
+        help="Overwrite existing solution in Splight HUB",
+    ),
+):
+    try:
+        manager = HubSolutionManager()
+        manager.push(name, version, description, tags, path, force=force)
+    except Exception as exc:
+        console.print(f"Error pushing component: {exc}", style=error_style)
+        raise typer.Exit(code=1)
+
+
+# TODO: Define the pull command
+# @solution_app.command()
+# def pull(
+#     ctx: typer.Context,
+#     name: str = typer.Argument(..., help="The component's name"),
+#     version: str = typer.Argument(..., help="The component's version"),
+# ):
+#     try:
+#         manager = HubComponentManager()
+#         manager.pull(name=name, version=version)
+#     except Exception as exc:
+#         console.print(f"Error pulling component: {exc}", style=error_style)
+#         raise typer.Exit(code=1)
+
+
+@solution_app.command()
+def list(ctx: typer.Context):
+    try:
+        manager = HubSolutionManager()
+        manager.list_solutions()
+    except Exception as exc:
+        console.print(f"Error listing components: {exc}", style=error_style)
+        raise typer.Exit(code=1)

splight_cli-4.12.0/splight_cli/hub/solution/constants.py

@@ -0,0 +1,3 @@
+MAIN_FILE = "main.tf"
+VARIABLES_FILE = "variables.tf"
+VALUES_FILE = "variables.tfvars"

splight_cli-4.12.0/splight_cli/hub/solution/exceptions.py

@@ -0,0 +1,22 @@
+class HubSolutionAlreadyExists(Exception):
+    def __init__(self, name: str, version: str):
+        self._msg = f"Solution {name}-{version} already exists in Splight Hub"
+
+    def __str__(self) -> str:
+        return self._msg
+
+
+class HubSolutionNotFound(Exception):
+    def __init__(self, name: str, version: str):
+        self._msg = f"Solution {name}-{version} not found in Splight Hub"
+
+    def __str__(self) -> str:
+        return self._msg
+
+
+class MissingSolutionFile(Exception):
+    def __init__(self, name: str, path: str):
+        self._msg = f"Missing solution file {name} in path {path}"
+
+    def __str__(self) -> str:
+        return self._msg

splight_cli-4.12.0/splight_cli/hub/solution/solution_manager.py

@@ -0,0 +1,88 @@
+import os
+from collections import namedtuple
+from typing import List
+
+from rich.console import Console
+from rich.table import Table
+from splight_lib.models import HubSolution
+
+from splight_cli.hub.solution.constants import (
+    MAIN_FILE,
+    VALUES_FILE,
+    VARIABLES_FILE,
+)
+from splight_cli.hub.solution.exceptions import (
+    HubSolutionAlreadyExists,
+    HubSolutionNotFound,
+    MissingSolutionFile,
+)
+from splight_cli.utils.loader import Loader
+
+console = Console()
+
+
+class HubSolutionManager:
+    def list_solutions(self):
+        solution_tuple = namedtuple("Solution", ["name", "version"])
+        all_solutions = HubSolution.list()
+        solutions = set(
+            [
+                solution_tuple(solution.name, solution.version)
+                for solution in all_solutions
+            ]
+        )
+        table = Table("Name", "Version", title="Hub Solution List")
+        [table.add_row(sol.name, sol.version) for sol in solutions]
+        console.print(table)
+
+    def push(
+        self,
+        name: str,
+        version: str,
+        description: str,
+        tags: List[str] = [],
+        path: str = ".",
+        force: bool = False,
+    ):
+        try:
+            solution = self._get_component(name, version)
+        except HubSolutionNotFound:
+            exist_in_hub = False
+            solution = HubSolution(
+                name=name, version=version, description=description, tags=tags
+            )
+        else:
+            exist_in_hub = True
+
+        if not force and exist_in_hub:
+            raise HubSolutionAlreadyExists(name, version)
+
+        self._set_files_from_path(solution, path)
+
+        with Loader("Pushing Solution to Splight Hub"):
+            solution.save()
+
+    def _set_files_from_path(self, solution: HubSolution, path: str):
+        main_file_path = os.path.join(path, MAIN_FILE)
+        if os.path.exists(main_file_path):
+            solution.main_file = main_file_path
+        else:
+            raise MissingSolutionFile(MAIN_FILE, path)
+
+        variables_file_path = os.path.join(path, VARIABLES_FILE)
+        if os.path.exists(main_file_path):
+            solution.variables_file = variables_file_path
+        else:
+            raise MissingSolutionFile(VARIABLES_FILE, path)
+
+        values_file_path = os.path.join(path, VALUES_FILE)
+        if os.path.exists(main_file_path):
+            solution.values_file = values_file_path
+        else:
+            raise MissingSolutionFile(VALUES_FILE, path)
+
+    def _get_component(self, name: str, version: str) -> HubSolution:
+        solutions = HubSolution.list(name=name, version=version)
+        if not solutions:
+            raise HubSolutionNotFound(name, version)
+        return solutions[0]

{splight_cli-4.11.2 → splight_cli-4.12.0}/splight_cli/solution/resource/diff.py

@@ -19,7 +19,7 @@ def Diff(new_arguments: Dict, old_arguments: Dict) -> Dict:
     for path, new_value in walk_dict(new_arguments):
         try:
             get_dict_value(path, old_arguments)
-        except:
+        except Exception:
             line = f"\t{Fore.GREEN}+{Style.RESET_ALL} {'.'.join([str(key) for key in path])}: {new_value}"
             diff.append(line)
             continue
@@ -32,7 +32,7 @@ def Diff(new_arguments: Dict, old_arguments: Dict) -> Dict:
     for path, old_value in walk_dict(old_arguments):
         try:
             get_dict_value(path, new_arguments)
-        except:
+        except Exception:
             line = f"\t{Fore.RED}-{Style.RESET_ALL} {'.'.join([str(key) for key in path])}: {strike_text(old_value)}"
             diff.append(line)
 

{splight_cli-4.11.2 → splight_cli-4.12.0}/splight_cli/solution/resource/models/base.py

@@ -50,7 +50,7 @@ class Resource:
         for path, _ in walk_dict(self.arguments):
             try:
                 new_value = get_dict_value(path, new_arguments)
-            except:
+            except Exception:
                 # This happens because the user gave a wrong extra attribute
                 # and was ignored by API so it is not present in the new arguments.
                 # By improving the function get_dict_value we could simplify

{splight_cli-4.11.2 → splight_cli-4.12.0}/splight_cli/utils/input.py

@@ -64,7 +64,7 @@ def prompt_param(param: Dict[str, Primitive], prefix: str = "") -> Primitive:
 def list_of(input_value: str, param_type: Type = str) -> List:
     try:
         values = literal_eval(input_value)
-    except:
+    except Exception:
         return None
 
     if not isinstance(values, List):