thestage 0.5.46__tar.gz → 0.5.47__tar.gz

{thestage-0.5.46 → thestage-0.5.47}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: thestage
-Version: 0.5.46
+Version: 0.5.47
 Summary: 
 Author: TheStage AI team
 Author-email: hello@thestage.ai
@@ -10,12 +10,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: aioconsole (>=0.8.0,<0.9.0)
 Requires-Dist: boto3 (>=1.35.80,<2.0.0)
 Requires-Dist: gitpython (>=3.1.40,<4.0.0)
 Requires-Dist: httpx (>=0.27.2,<0.28.0)
-Requires-Dist: paramiko (>=3.4.0,<4.0.0)
+Requires-Dist: paramiko (>=3.5.1,<4.0.0)
 Requires-Dist: pydantic (>=2.4.2,<3.0.0)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-gettext-translations (>=1.1.0,<2.0.0)

{thestage-0.5.46 → thestage-0.5.47}/pyproject.toml

@@ -1,6 +1,8 @@
 [tool.poetry]
 name = "thestage"
-version = "0.5.46"
+
+version = "0.5.47"
+
 description = ""
 authors = ["TheStage AI team <hello@thestage.ai>"]
 readme = "README.md"
@@ -27,7 +29,7 @@ pydantic = "^2.4.2"
 gitpython = "^3.1.40"
 requests = "^2.31.0"
 python-gettext-translations = "^1.1.0"
-paramiko = "^3.4.0"
+paramiko = "^3.5.1"
 
 aioconsole = "^0.8.0"
 httpx = "^0.27.2"

thestage-0.5.47/thestage/.env

@@ -0,0 +1,5 @@
+; THESTAGE_CONFIG_DIR=.thestage
+; THESTAGE_CONFIG_FILE=config.json
+; THESTAGE_API_URL=https://backend-staging3.thestage.ai
+; THESTAGE_API_URL=http://localhost:8100
+; LOG_FILE=thestage.log

{thestage-0.5.46 → thestage-0.5.47}/thestage/__init__.py

@@ -1,3 +1,4 @@
 from . import *
 __app_name__ = "thestage"
-__version__ = "0.5.46"
+
+__version__ = "0.5.47"

thestage-0.5.47/thestage/cli_command.py

@@ -0,0 +1,56 @@
+from enum import Enum
+
+class CliCommand(str, Enum):
+    VERSION = "VERSION"
+    CONNECT = "CONNECT"
+    PROJECT_CLONE = "PROJECT_CLONE"
+    PROJECT_INIT = "PROJECT_INIT"
+    PROJECT_RUN = "PROJECT_RUN"
+    PROJECT_CHECKOUT = "PROJECT_CHECKOUT"
+    PROJECT_PULL = "PROJECT_PULL"
+    PROJECT_RESET = "PROJECT_RESET"
+    PROJECT_INFERENCE_SIMULATOR_RUN = "PROJECT_INFERENCE_SIMULATOR_RUN"
+    PROJECT_INFERENCE_SIMULATOR_SAVE_METADATA = "PROJECT_INFERENCE_SIMULATOR_SAVE_METADATA"
+    PROJECT_INFERENCE_SIMULATOR_PUSH = "PROJECT_INFERENCE_SIMULATOR_PUSH"
+    PROJECT_INFERENCE_SIMULATOR_LS = "PROJECT_INFERENCE_SIMULATOR_LS"
+    PROJECT_INFERENCE_SIMULATOR_LOGS = "PROJECT_INFERENCE_SIMULATOR_LOGS"
+    PROJECT_MODEL_LS = "PROJECT_MODEL_LS"
+    PROJECT_MODEL_DEPLOY_INSTANCE = "PROJECT_MODEL_DEPLOY_INSTANCE"
+    PROJECT_MODEL_DEPLOY_SAGEMAKER = "PROJECT_MODEL_DEPLOY_SAGEMAKER"
+    PROJECT_TASK_CANCEL = "PROJECT_TASK_CANCEL"
+    PROJECT_TASK_LS = "PROJECT_TASK_LS"
+    PROJECT_TASK_LOGS = "PROJECT_TASK_LOGS"
+    PROJECT_CONFIG_SET_DEFAULT_CONTAINER = "PROJECT_CONFIG_SET_DEFAULT_CONTAINER"
+    PROJECT_CONFIG_GET = "PROJECT_CONFIG_GET"
+    CONTAINER_LS = "CONTAINER_LS"
+    CONTAINER_INFO = "CONTAINER_INFO"
+    CONTAINER_CONNECT = "CONTAINER_CONNECT"
+    CONTAINER_UPLOAD = "CONTAINER_UPLOAD"
+    CONTAINER_DOWNLOAD = "CONTAINER_DOWNLOAD"
+    CONTAINER_START = "CONTAINER_START"
+    CONTAINER_STOP = "CONTAINER_STOP"
+    CONTAINER_RESTART = "CONTAINER_RESTART"
+    CONTAINER_LOGS = "CONTAINER_LOGS"
+    INSTANCE_RENTED_LS = "INSTANCE_RENTED_LS"
+    INSTANCE_RENTED_CONNECT = "INSTANCE_RENTED_CONNECT"
+    INSTANCE_SELF_HOSTED_LS = "INSTANCE_SELF_HOSTED_LS"
+    INSTANCE_SELF_HOSTED_CONNECT = "INSTANCE_SELF_HOSTED_CONNECT"
+    CONFIG_GET = "CONFIG_GET"
+    CONFIG_SET = "CONFIG_SET"
+    CONFIG_CLEAR = "CONFIG_CLEAR"
+    CONFIG_UPLOAD_SSH_KEY = "CONFIG_UPLOAD_SSH_KEY"
+
+
+class CliCommandAvailability(str, Enum):
+    ALLOWED = "ALLOWED"
+    RESTRICTED = "RESTRICTED"
+    DEPRECATED = "DEPRECATED"
+
+
+ALWAYS_AVAILABLE_COMMANDS = [
+    CliCommand.VERSION,
+    CliCommand.PROJECT_CONFIG_GET,
+    CliCommand.CONFIG_GET,
+    CliCommand.CONFIG_SET,
+    CliCommand.CONFIG_CLEAR,
+]

thestage-0.5.47/thestage/cli_command_helper.py

@@ -0,0 +1,51 @@
+from typing import Callable
+
+import typer
+
+from thestage.cli_command import CliCommand, CliCommandAvailability
+from thestage.color_scheme.color_scheme import ColorScheme
+from thestage.config import config_storage
+from rich import print
+
+
+def cli_command(command_id: CliCommand):
+    def decorator(func: Callable):
+        setattr(func, "__cli_command__", command_id)
+        return func
+    return decorator
+
+
+def get_command_metadata(command_id: CliCommand) -> dict:
+    return {
+        "rich_help_panel": get_command_help_panel(command_id),
+        "deprecated": is_command_deprecated(command_id),
+    }
+
+
+def get_command_group_help_panel() -> str:
+    return "Command Groups"
+
+
+def get_command_help_panel(command: CliCommand) -> str:
+    if config_storage.APP_CONFIG.runtime.allowed_commands.get(command) == CliCommandAvailability.ALLOWED:
+        return "Allowed Commands"
+    if config_storage.APP_CONFIG.runtime.allowed_commands.get(command) == CliCommandAvailability.RESTRICTED:
+        return "Restricted Commands"
+    if config_storage.APP_CONFIG.runtime.allowed_commands.get(command) == CliCommandAvailability.DEPRECATED:
+        return "Deprecated Commands"
+
+
+def is_command_deprecated(command: CliCommand) -> bool:
+    if config_storage.APP_CONFIG.runtime.allowed_commands.get(command) == CliCommandAvailability.DEPRECATED:
+        return True
+    return False
+
+
+def check_command_permission(executed_command: CliCommand):
+    if config_storage.APP_CONFIG.runtime.is_token_valid == False and executed_command != CliCommand.CONFIG_SET:
+        print(f"[{ColorScheme.WARNING.value}]Your API Token is not valid. You can update the token using 'thestage config set' command[{ColorScheme.WARNING.value}]")
+
+    is_allowed = config_storage.APP_CONFIG.runtime.allowed_commands.get(executed_command) == CliCommandAvailability.ALLOWED
+    if not is_allowed:
+        typer.echo("Action is not allowed")
+        raise typer.Exit(code=1)

thestage-0.5.47/thestage/config/config_storage.py

@@ -0,0 +1,3 @@
+from thestage.services.core_files.config_entity import ConfigEntity
+
+APP_CONFIG: ConfigEntity | None = None

{thestage-0.5.46 → thestage-0.5.47}/thestage/controllers/base_controller.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 from typing import Optional
 
+from thestage.cli_command import CliCommand
+from thestage.cli_command_helper import get_command_metadata, check_command_permission
 from thestage.i18n.translation import __
 from thestage.helpers.logger.app_logger import app_logger
 from thestage.controllers.utils_controller import get_current_directory, validate_config_and_get_service_factory
@@ -10,24 +12,23 @@ import typer
 
 from thestage.services.connect.connect_service import ConnectService
 
-app = typer.Typer(no_args_is_help=True)
+app = typer.Typer(no_args_is_help=True,)
 
 
-@app.command(no_args_is_help=False)
+@app.command(name='version', help="Get application's name and version", no_args_is_help=False, **get_command_metadata(CliCommand.VERSION))
 def version():
-    """
-        Returns the application's name and version
-    """
-    app_logger.info(f'Start version from {get_current_directory()}')
-    typer.echo(
-        __("%app_name% v%version%", {'app_name': __app_name__, 'version': __version__}))
+    command_name = CliCommand.VERSION
+    app_logger.info(f'Running {command_name} from {get_current_directory()}')
+    check_command_permission(command_name)
+
+    typer.echo(f"{__app_name__} v{__version__}")
     raise typer.Exit(0)
 
 
-@app.command(name="connect", no_args_is_help=True, help=__("Connect to server instance or container using unique ID"))
+@app.command(name="connect", no_args_is_help=True, help=__("Connect to server instance or container or task"), **get_command_metadata(CliCommand.CONNECT))
 def connect(
         uid: Optional[str] = typer.Argument(
-            help=__("Unique ID of server instance or container"), ),
+            help=__("Unique ID of server instance or container or task ID"), ),
         username: Optional[str] = typer.Option(
             None,
             '--username',
@@ -43,10 +44,9 @@ def connect(
             is_eager=False,
         ),
 ):
-    """
-        Connects to entity with a unique ID
-    """
-    app_logger.info(f'Connect to some entity with UID')
+    command_name = CliCommand.CONNECT
+    app_logger.info(f'Running {command_name} from {get_current_directory()}')
+    check_command_permission(command_name)
 
     if private_ssh_key_path and not Path(private_ssh_key_path).is_file():
         typer.echo(f'No file found at provided path {private_ssh_key_path}')
@@ -56,7 +56,11 @@ def connect(
 
     connect_service: ConnectService = service_factory.get_connect_service()
 
-    connect_service.connect_to_entity(uid=uid, username=username, private_key_path=private_ssh_key_path)
+    connect_service.connect_to_entity(
+        uid=uid,
+        username=username,
+        private_key_path=private_ssh_key_path
+    )
 
 
     app_logger.info(f'Stop connect to entity')

{thestage-0.5.46 → thestage-0.5.47}/thestage/controllers/config_controller.py

@@ -1,38 +1,37 @@
-import os
 from pathlib import Path
 
 import click
+
+from thestage.cli_command import CliCommand
+from thestage.cli_command_helper import get_command_metadata, check_command_permission
 from thestage.services.core_files.config_entity import ConfigEntity
 
 from thestage.entities.enums.yes_no_response import YesOrNoResponse
 from thestage.i18n.translation import __
 from thestage.helpers.logger.app_logger import app_logger, get_log_path_from_os
-from thestage.services.config_provider.config_provider import ConfigProvider
 from thestage.services.connect.connect_service import ConnectService
 from thestage.services.service_factory import ServiceFactory
-from thestage.controllers.utils_controller import get_current_directory, validate_config_and_get_service_factory
+from thestage.controllers.utils_controller import get_current_directory
 
 import typer
 
 app = typer.Typer(no_args_is_help=True, help=__("Manage configuration settings"))
 
 
-@app.command(name='get', no_args_is_help=False, help=__("Display all configuration settings"))
+@app.command(name='get', no_args_is_help=False, help=__("Display all configuration settings"), **get_command_metadata(CliCommand.CONFIG_GET))
 def config_get():
-    """
-        Lists all configuration settings
-    """
-    app_logger.info(f'Start config from {get_current_directory()}')
+    command_name = CliCommand.CONFIG_GET
+    app_logger.info(f'Running {command_name} from {get_current_directory()}')
+    check_command_permission(command_name)
 
-    local_path = get_current_directory()
-    config_provider = ConfigProvider(local_path=local_path)
-    config: ConfigEntity = config_provider.get_full_config()
+    config_provider = ServiceFactory().get_config_provider()
+    config: ConfigEntity = config_provider.get_config()
 
     if not config:
         typer.echo(__('No configuration found'))
         raise typer.Exit(1)
 
-    config_provider.save_config(config=config)
+    config_provider.save_config()
 
     typer.echo(__('THESTAGE TOKEN: %token%', {'token': config.main.thestage_auth_token or ''}))
     typer.echo(__('THESTAGE API LINK: %link%', {'link': config.main.thestage_api_url or ''}))
@@ -45,7 +44,7 @@ def config_get():
     raise typer.Exit(0)
 
 
-@app.command(name='set', no_args_is_help=True, help=__("Update configuration settings"))
+@app.command(name='set', no_args_is_help=True, help=__("Update configuration settings"), **get_command_metadata(CliCommand.CONFIG_SET))
 def config_set(
     token: str = typer.Option(
             None,
@@ -55,40 +54,36 @@ def config_set(
             is_eager=False,
         ),
 ):
-    """
-        Updates configuration settings
-    """
-    app_logger.info(f'Start config from {get_current_directory()}')
-
-    config_provider = ConfigProvider(local_path=get_current_directory())
-    service_factory = ServiceFactory(config_provider)
+    command_name = CliCommand.CONFIG_SET
+    app_logger.info(f'Running {command_name} from {get_current_directory()}')
+    check_command_permission(command_name)
 
+    service_factory = ServiceFactory()
     app_service = service_factory.get_app_config_service()
 
     if token:
-        app_service.app_change_token(config=config_provider.get_full_config(), token=token)
+        app_service.app_change_token(token=token)
 
     typer.echo('Configuration updated successfully')
     raise typer.Exit(0)
 
 
-@app.command(name='clear', no_args_is_help=False, help=__("Clear configuration"))
+@app.command(name='clear', no_args_is_help=False, help=__("Clear configuration"), **get_command_metadata(CliCommand.CONFIG_CLEAR))
 def config_clear():
-    """
-        Clears all configuration settings
-    """
-    app_logger.info(f'Start config from {get_current_directory()}')
-    local_path = get_current_directory()
-    config_provider = ConfigProvider(local_path=local_path)
-    config_dir = config_provider.get_full_config().runtime.config_global_path
+    command_name = CliCommand.CONFIG_CLEAR
+    app_logger.info(f'Running {command_name} from {get_current_directory()}')
+    check_command_permission(command_name)
+
+    config_provider = ServiceFactory().get_config_provider()
+    config_dir = config_provider.get_config().runtime.config_global_path
     config_provider.clear_config()
     typer.echo(f'Removed {config_dir}')
 
     raise typer.Exit(0)
 
 
-@app.command(name='upload-ssh-key', no_args_is_help=True, help=__("Send your public SSH key to the platform and / or rented server instance"))
-def config_set(
+@app.command(name='upload-ssh-key', no_args_is_help=True, help=__("Send your public SSH key to the platform and / or rented server instance"), **get_command_metadata(CliCommand.CONFIG_UPLOAD_SSH_KEY))
+def upload_ssh_key(
         ssh_public_key: str = typer.Argument(
             help=__("Path to your public SSH key file or your public SSH key contents"),
         ),
@@ -100,14 +95,11 @@ def config_set(
             is_eager=False,
         )
 ):
-    """
-        Sends SSH key to the platform
-    """
-
-    app_logger.info(f'Start config from {get_current_directory()}')
+    command_name = CliCommand.CONFIG_UPLOAD_SSH_KEY
+    app_logger.info(f'Running {command_name} from {get_current_directory()}')
+    check_command_permission(command_name)
 
-    config_provider = ConfigProvider(local_path=get_current_directory())
-    service_factory = ServiceFactory(config_provider)
+    service_factory = ServiceFactory()
     connect_service: ConnectService = service_factory.get_connect_service()
 
     is_path_provided_confirmed = False