splight-cli 5.1.4.dev0__tar.gz → 5.1.6__tar.gz

{splight_cli-5.1.4.dev0 → splight_cli-5.1.6}/PKG-INFO

@@ -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 → splight_cli-5.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-cli"
-version = "5.1.4dev0"
+version = "5.1.6"
 description = "Splight Command Line Interface"
 authors = ["Splight Dev <dev@splight-ae.com>"]
 readme = "README.md"

{splight_cli-5.1.4.dev0 → splight_cli-5.1.6}/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-5.1.4.dev0 → splight_cli-5.1.6}/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-5.1.4.dev0 → splight_cli-5.1.6}/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/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-5.1.4.dev0/splight_cli/context/exceptions.py

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