splight-cli 5.1.4.dev0__py3-none-any.whl → 5.1.6__py3-none-any.whl

splight_cli/cli.py

@@ -7,7 +7,7 @@ from splight_cli.component import component_app
 from splight_cli.config import config_app
 from splight_cli.constants import error_style
 from splight_cli.context import Context
-from splight_cli.context.exceptions import MissingConfigurationFile
+from splight_cli.context.workspace import ConfigurationError
 from splight_cli.engine import engine_app
 from splight_cli.hub import hub_app
 from splight_cli.solution import solution_app
@@ -50,7 +50,7 @@ def main(
                 True if ctx.invoked_subcommand == "configure" else False
             )
         )
-    except MissingConfigurationFile as exc:
+    except ConfigurationError as exc:
         console.print(
             (
                 f"Error running Splight: {str(exc)}. "

splight_cli/context/workspace.py

@@ -8,7 +8,6 @@ from splight_cli.constants import (
     DEFAULT_WORKSPACE_NAME,
     DEFAULT_WORKSPACES,
 )
-from splight_cli.context.exceptions import MissingConfigurationFile
 from splight_cli.settings import SplightCLIConfig, SplightCLISettings
 from splight_cli.utils.yaml import get_yaml_from_file, save_yaml_to_file
 
@@ -32,21 +31,39 @@ class NotExistingWorkspace(Exception):
         return self._msg
 
 
+class ConfigurationError(Exception):
+    pass
+
+
 class WorkspaceManager:
     def __init__(self, new_workspace: bool = False):
-        if not os.path.exists(CONFIG_FILE) and not new_workspace:
-            raise MissingConfigurationFile("Config file does not exist")
         self.config_file = CONFIG_FILE
-        path = Path(self.config_file)
-        path.parent.mkdir(parents=True, exist_ok=True)
-        path.touch()
         self._config = self.__load_config()
         self._workspaces = self._config.workspaces
         self._current_workspace = self._config.current_workspace
         self._settings = self._workspaces[self._current_workspace]
+        if not self._settings.is_configured() and not new_workspace:
+            raise ConfigurationError(
+                (
+                    "There is at least one variable missing. "
+                    "Use command 'splight configure'"
+                )
+            )
 
     def __load_config(self):
-        config = get_yaml_from_file(self.config_file)
+        try:
+            if os.path.exists(self.config_file):
+                config = self._load_from_file(self.config_file)
+            else:
+                config = self._load_from_env()
+        except Exception as exc:
+            raise ConfigurationError(
+                "An error ocurred while loading configuration"
+            ) from exc
+        return config
+
+    def _load_from_file(self, file_path: str) -> SplightCLIConfig:
+        config = get_yaml_from_file(file_path)
         # Default values
         config["workspaces"] = config.get("workspaces", DEFAULT_WORKSPACES)
         workspace_name = config.get(
@@ -59,10 +76,21 @@ class WorkspaceManager:
                 else list(config["workspaces"].keys())[0]
             )
         config["current_workspace"] = workspace_name
-        save_yaml_to_file(config, self.config_file)
+        save_yaml_to_file(config, file_path)
         config = SplightCLIConfig.model_validate(config)
         return config
 
+    def _load_from_env(self) -> SplightCLIConfig:
+        config = SplightCLIConfig(
+            current_workspace=DEFAULT_WORKSPACE_NAME,
+            workspaces=DEFAULT_WORKSPACES,
+        )
+        path = Path(self.config_file)
+        path.parent.mkdir(parents=True, exist_ok=True)
+        path.touch()
+        save_yaml_to_file(config.model_dump(), self.config_file)
+        return config
+
     @property
     def settings(self) -> SplightCLISettings:
         return self._settings

splight_cli/settings.py

@@ -7,16 +7,22 @@ from splight_cli.version import __version__
 
 
 class SplightCLISettings(BaseSettings):
-    SPLIGHT_ACCESS_ID: str = ""
-    SPLIGHT_SECRET_KEY: str = ""
+    SPLIGHT_ACCESS_ID: str | None = None
+    SPLIGHT_SECRET_KEY: str | None = None
     SPLIGHT_PLATFORM_API_HOST: str = "https://api.splight-ai.com"
-    SPLIGHT_GRPC_HOST: str = "grpc.splight-ai.com:443"
 
     model_config: ConfigDict = ConfigDict(extra="ignore")
 
+    def is_configured(self) -> bool:
+        return (
+            False
+            if not self.SPLIGHT_ACCESS_ID or not self.SPLIGHT_SECRET_KEY
+            else True
+        )
+
 
 class SplightCLIConfig(BaseModel):
-    current_workspace: str
+    current_workspace: str = "default"
     workspaces: Dict[str, SplightCLISettings]
 
 

{splight_cli-5.1.4.dev0.dist-info → splight_cli-5.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-cli
-Version: 5.1.4.dev0
+Version: 5.1.6
 Summary: Splight Command Line Interface
 Author: Splight Dev
 Author-email: dev@splight-ae.com

{splight_cli-5.1.4.dev0.dist-info → splight_cli-5.1.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 splight_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-splight_cli/cli.py,sha256=bwC3okE3v9ND1KQXoL49HLWhEU2vI6qXRMq450wTKwQ,1819
+splight_cli/cli.py,sha256=uw8B_kcI6Xrl_yt4YEfWWZassaKKQ6P0LWxbwW0ELAs,1806
 splight_cli/component/__init__.py,sha256=0M0_EX7l8K3ygQ-ZCcCTnrnDwkhC6TRrFgqXRSP959s,3760
 splight_cli/component/component.py,sha256=IQr-70aCHtVeRrLVXn_7NVksXyoFix526ejjSOZqv2Y,5901
 splight_cli/component/exceptions.py,sha256=UuOgRAciX4KWKKL9WHMLlZNwg3onL8OT9d7Zo2Oj7Ng,1468
@@ -17,9 +17,7 @@ splight_cli/component/utils.py,sha256=b0y1rYU-xdJMnaU11eX9yoZtr33jkVyyu24m725Nx1
 splight_cli/config/__init__.py,sha256=0E5tAC4AKR-Mkdg1KiPrFweZI9HemiCxKFTIUTFmGXs,2678
 splight_cli/constants.py,sha256=M-Ce3F5TVzM_Z1T06SytUckXtpiaLsLDkbk-jbOe0GA,1605
 splight_cli/context/__init__.py,sha256=BxEVhXTM7jKAOw05yu8o426mvqpX-hVVAS98-okoBhE,848
-splight_cli/context/context.py,sha256=CdW8xP76iBESaFpCP8q9fQ34KN47IV55Qj84MAYuOqM,383
-splight_cli/context/exceptions.py,sha256=eoFdjWcaQaT5s04yflesFYwCgMwaYIbnoZ-Ix13WI5k,110
-splight_cli/context/workspace.py,sha256=piQmVDJeWD-LRU6StKF1ZWHJBsmfYSpYJsWMisl4lAo,4165
+splight_cli/context/workspace.py,sha256=tY07SgO85DmA37XEetic6rLsgiWaicV1cEqcomHnuWA,4984
 splight_cli/engine/__init__.py,sha256=nYCVy9OmJUj8xLffLLLGrC7gvhyaS6jtDMAgZp9ibcs,1016
 splight_cli/engine/alert/__init__.py,sha256=zIVscSIG6mSAkjX5IBGOn8NmpYFahGk7eQgA_oAxJOU,2004
 splight_cli/engine/asset/__init__.py,sha256=-mgaA9FVFZGdhklX3FWQqG1m-g8-0Olr5-GZEMi5mdE,1950
@@ -50,7 +48,7 @@ splight_cli/hub/solution/__init__.py,sha256=058hv5MTw0jZ3b96UUm2o2kj5F2z0zNGzNlG
 splight_cli/hub/solution/constants.py,sha256=nmWdgB4BuFeGpWfXpc78gUTPVeO2ZSptK5IaUDzWka0,113
 splight_cli/hub/solution/exceptions.py,sha256=9opbWY1_I4ziccnlerfrZlCvtS__5FBpr_3Uog5nlaA,861
 splight_cli/hub/solution/solution_manager.py,sha256=izeXTTbqlZWlDtQ-dAJvlDc6tJO12TKVRRpk0ZaDWa4,3670
-splight_cli/settings.py,sha256=uCup6j2lt4LygJu4k8cfYXVPVT3-K0m20K1OiUNt_hI,720
+splight_cli/settings.py,sha256=58_Eu-tUUR4T5b--dXXu9JJEICAZnxG9Ex_a7SE-Lu4,873
 splight_cli/solution/__init__.py,sha256=oyIsCBczZ6bpWhufej7ySVCEO3u0qSAXgEZvwy1os4I,2287
 splight_cli/solution/dict.py,sha256=fA_5f-N-raTtg0G1WjFvq9YgDGEjbIKPrLBtaX2mNo8,1342
 splight_cli/solution/parser.py,sha256=19jNYiwL3NhbncgxJa66QogBXaNYDn0Qq4W5YdpplSo,3845
@@ -85,7 +83,7 @@ splight_cli/utils/template.py,sha256=VHm2EM_xBLge0bZ3iOCkyAIAl7j2tOC3-O2yEV1Kljs
 splight_cli/utils/yaml.py,sha256=jhNdQa_ExlSaXsPnlfLKKMOKbF1fJLpx0o264AdCNrg,754
 splight_cli/version.py,sha256=Oa-bywO4Gja4qAmE1fgo99yJvRzJwQ0psMFMB7CmjMo,78
 splight_cli/workspace/__init__.py,sha256=-7_p7glSPFqSg5zzQR8uMlAD0r1R6q1mPjNXlRtnkls,2839
-splight_cli-5.1.4.dev0.dist-info/METADATA,sha256=gM6gsPMvKKper3KiVVDf71hEzlUAzSsecWRTwp4jC0Y,12438
-splight_cli-5.1.4.dev0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-splight_cli-5.1.4.dev0.dist-info/entry_points.txt,sha256=lcQvpsOL_pP12pneurzqzFByIzr8SkgL70sjI0esTyM,47
-splight_cli-5.1.4.dev0.dist-info/RECORD,,
+splight_cli-5.1.6.dist-info/METADATA,sha256=onJ7DY6MrCyCyzQMVui1nDNKn-A3AT3VeKbGCsL3_-s,12433
+splight_cli-5.1.6.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+splight_cli-5.1.6.dist-info/entry_points.txt,sha256=lcQvpsOL_pP12pneurzqzFByIzr8SkgL70sjI0esTyM,47
+splight_cli-5.1.6.dist-info/RECORD,,

splight_cli/context/context.py

@@ -1,9 +0,0 @@
-import typer
-
-
-def local_environment_context(ctx: typer.Context, local_dev: bool):
-    if local_dev:
-        db_client_mod = "splight_lib.client.database.LocalDatabaseClient"
-        dl_client_mod = "splight_lib.client.datalake.LocalDatalakeClient"
-        ctx.obj.workspace.settings.DATABASE_CLIENT = db_client_mod
-        ctx.obj.workspace.settings.DATALAKE_CLIENT = dl_client_mod

splight_cli/context/exceptions.py

@@ -1,3 +0,0 @@
-class MissingConfigurationFile(Exception):
-    def __init__(self, message):
-        super().__init__(message)