splight-cli 4.12.2__tar.gz → 4.14.1__tar.gz

{splight_cli-4.12.2 → splight_cli-4.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-cli
-Version: 4.12.2
+Version: 4.14.1
 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.6,<6.0.0)
+Requires-Dist: splight-lib (>=5.8.0)
 Requires-Dist: toposort (>=1.10,<2.0)
 Requires-Dist: typer (==0.9.0)
 Description-Content-Type: text/markdown

{splight_cli-4.12.2 → splight_cli-4.14.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-cli"
-version = "4.12.2"
+version = "4.14.1"
 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.6.6"
+splight-lib = ">=5.8.0"
 py7zr = "0.20.8"
 typer = "0.9.0"
 colorama = "0.4.4"

{splight_cli-4.12.2 → splight_cli-4.14.1}/splight_cli/component/component.py

@@ -1,4 +1,3 @@
-import json
 import os
 import subprocess
 from enum import auto
@@ -8,7 +7,6 @@ from typing import List, Optional
 from caseconverter import pascalcase
 from jinja2 import Template
 from rich.console import Console
-from splight_lib.client.database import LOCAL_DB_FILE
 from splight_lib.component.spec import Spec
 from strenum import LowercaseStrEnum
 
@@ -19,11 +17,6 @@ from splight_cli.component.exceptions import (
     ReadmeExists,
 )
 from splight_cli.component.loaders import InitLoader
-from splight_cli.component.utils import (
-    db_from_spec,
-    fake_asset,
-    fake_attribute,
-)
 from splight_cli.constants import (
     INIT_FILE,
     PYTHON_CMD,
@@ -207,19 +200,3 @@ class ComponentManager:
     def _validate_cli_version(self, component_cli_version: str):
         if component_cli_version != __version__:
             raise InvalidSplightCLIVersion(component_cli_version, __version__)
-
-    def create_local_db(self, path: str):
-        spec = Spec.from_file(os.path.join(path, SPEC_FILE))
-        json_spec = spec.model_dump()
-
-        splight_db = db_from_spec(json_spec)
-
-        # agnostic from component
-        asset = fake_asset()
-        splight_db["asset"].update(asset)
-
-        attribute = fake_attribute()
-        splight_db["attribute"].update(attribute)
-
-        with open(LOCAL_DB_FILE, "w") as db_file:
-            json.dump(splight_db, db_file, indent=4)

{splight_cli-4.12.2 → splight_cli-4.14.1}/splight_cli/hub/solution/__init__.py

@@ -1,5 +1,3 @@
-from typing import List
-
 import typer
 from rich.console import Console
 from splight_lib.models import Component
@@ -21,11 +19,7 @@ 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"),
+    path: str = typer.Argument(..., help="Path to solution files"),
     force: bool = typer.Option(
         False,
         "--force",
@@ -35,25 +29,28 @@ def push(
 ):
     try:
         manager = HubSolutionManager()
-        manager.push(name, version, description, tags, path, force=force)
+        manager.push(path, force=force)
     except Exception as exc:
-        console.print(f"Error pushing component: {exc}", style=error_style)
+        import traceback
+        import sys
+        traceback.print_exc(file=sys.stdout)
+        console.print(f"Error pushing solution: {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 pull(
+    ctx: typer.Context,
+    name: str = typer.Argument(..., help="The component's name"),
+    version: str = typer.Argument(..., help="The component's version"),
+):
+    try:
+        manager = HubSolutionManager()
+        manager.pull(name=name, version=version)
+    except Exception as exc:
+        console.print(f"Error pulling solution: {exc}", style=error_style)
+        raise typer.Exit(code=1)
 
 
 @solution_app.command()

{splight_cli-4.12.2 → splight_cli-4.14.1}/splight_cli/hub/solution/exceptions.py

@@ -20,3 +20,11 @@ class MissingSolutionFile(Exception):
 
     def __str__(self) -> str:
         return self._msg
+
+
+class SolutionDirectoryAlreadyExists(Exception):
+    def __init__(self, path: str):
+        self._msg = f"Solution directory {path} already exists"
+
+    def __str__(self) -> str:
+        return self._msg

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

@@ -0,0 +1,115 @@
+import json
+import os
+import shutil
+from collections import namedtuple
+
+import py7zr
+from pydantic import ValidationError
+from rich.console import Console
+from rich.table import Table
+from splight_lib.models import HubSolution
+
+from splight_cli.constants import COMPRESSION_TYPE, SPEC_FILE, success_style
+from splight_cli.hub.component.exceptions import (
+    SpecFormatError,
+    SpecValidationError,
+)
+from splight_cli.hub.solution.exceptions import (
+    HubSolutionAlreadyExists,
+    HubSolutionNotFound,
+    SolutionDirectoryAlreadyExists,
+)
+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,
+        path: str = ".",
+        force: bool = False,
+    ):
+        try:
+            with open(os.path.join(path, SPEC_FILE)) as fid:
+                spec = json.load(fid)
+        except Exception as exc:
+            raise SpecFormatError(exc)
+
+        # Validate spec fields before pushing the model
+        try:
+            instance = HubSolution.model_validate(spec)
+        except ValidationError as exc:
+            raise SpecValidationError(exc)
+
+        name = instance.name
+        version = instance.version
+
+        if not force and self._exists_in_hub(name, version):
+            raise HubSolutionAlreadyExists(name, version)
+
+        with Loader("Pushing Solution to Splight Hub"):
+            solution = HubSolution.upload(path)
+
+        console.print(
+            f"Solution {solution.id} pushed succesfully", style=success_style
+        )
+
+    def pull(self, name: str, version: str):
+        with Loader("Pulling solution from Splight Hub"):
+            self._pull_solution(name, version)
+        console.print(
+            f"Solution {name} pulled succesfully", style=success_style
+        )
+
+    def _pull_solution(self, name: str, version: str):
+        solution = self._get_hub_solution(name, version)
+        name, version = solution.name, solution.version
+        file_wrapper = solution.download()
+        file_data = file_wrapper.read()
+
+        version_modified = version.replace(".", "_")
+        solution_path = f"{name}/{version_modified}"
+        versioned_name = f"{name}-{version}"
+        file_name = f"{versioned_name}.{COMPRESSION_TYPE}"
+        if os.path.exists(solution_path):
+            raise SolutionDirectoryAlreadyExists(solution_path)
+
+        try:
+            with open(file_name, "wb") as fid:
+                fid.write(file_data)
+
+            with py7zr.SevenZipFile(file_name, "r") as z:
+                z.extractall(path=".")
+            shutil.move(f"{versioned_name}", solution_path)
+        except Exception as exc:
+            raise exc
+        finally:
+            if os.path.exists(file_name):
+                os.remove(file_name)
+
+    def _get_hub_solution(self, name: str, version: str) -> HubSolution:
+        solutions = HubSolution.list(name=name, version=version)
+        if not solutions:
+            raise HubSolutionNotFound(name, version)
+        return solutions[0]
+
+    def _exists_in_hub(self, name: str, version: str) -> bool:
+        try:
+            self._get_hub_solution(name, version)
+            return True
+        except HubSolutionNotFound:
+            return False

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

@@ -1,95 +0,0 @@
-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,
-    README_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(variables_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(values_file_path):
-            solution.values_file = values_file_path
-        else:
-            raise MissingSolutionFile(VALUES_FILE, path)
-
-        readme_file_path = os.path.join(path, README_FILE)
-        if os.path.exists(readme_file_path):
-            solution.readme_file = readme_file_path
-        else:
-            raise MissingSolutionFile(README_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]