thestage 0.5.46__tar.gz → 0.5.49__tar.gz

{thestage-0.5.46 → thestage-0.5.49}/LICENSE.txt

@@ -1,13 +1,13 @@
-Copyright 2024 TheStage AI. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
+Copyright 2024 TheStage AI. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
 limitations under the License.

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: thestage
-Version: 0.5.46
+Version: 0.5.49
 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.49}/README.md

@@ -1,69 +1,69 @@
-# Introduction
-
-[TheStage AI](https://app.thestage.ai/) is an integrated platform designed for AI researchers, focusing on solving challenges related to accelerating deep neural network (DNN) inference.
-
-**TheStage CLI** provides a command-line interface for interacting with TheStage AI infrastructure, allowing researchers to:
-
-- **Server Instances:** Retrieve information and connect to instances.
-- **Docker Containers:** Manage containers by retrieving information, connecting, streaming real-time logs, uploading/downloading files, and starting/stopping containers.
-- **Projects:** Clone and initialize projects, retrieve project specific task information, run tasks within a project, and stream real-time task logs.
-
-TheStage AI's web-based interface provides full control over managing resources such as creating, renting, deleting components, etc..
-
-# Requirements
-
-TheStage CLI is developed using Python and Poetry. Supported versions are Python 3.9 to 3.12 and Poetry 1.7.1. While the CLI is compatible with various operating systems, we recommend using a Unix-like OS such as Linux or macOS for optimal performance.
-
-**Additional Software Requirements:**
-
-- Git
-- Python 3.9 to 3.12
-- SSH client
-
-These tools must be installed for the CLI to function correctly.
-
-# Authentication and Authorization
-
-To securely connect to TheStage AI's backend and access information about server instances, containers, and more, API tokens are required. These tokens serve as both authentication and authorization mechanisms and can be generated through TheStage AI's web application.
-
-**Note:** An account on TheStage AI is required to generate an API token. Please refer to TheStage AI documentation: TheStage AI Platform: [SSH Keys and API Tokens](https://docs.thestage.ai/platform/build/thestage-ai-ssh-keys-and-api-tokens.html) for more information.
-
-# Installation and Initialization
-
-To generate an API token, please login to your [TheStage AI account](https://app.thestage.ai/sign-in),  and navigate to the Profile > API tokens section. Please refer to [TheStage AI platform documentation](https://docs.thestage.ai/platform/build/thestage-ai-ssh-keys-and-api-tokens.html) for more information.
-
-```python
-# To install TheStage CLI:
-pip install thestage
-
-# To upgrade thestage CLI:
-pip install thestage --upgrade
-
-# To set or change an API token:
-thestage config set --api-token <API_token>
-
-# To get help:
-thestage --help
-```
-
-# Using the CLI
-
-## **Unique IDs**
-
-When working with components of your computational cluster—such as server instances, Docker containers, and projects—the CLI often requires you to specify the unique ID of the component. This unique ID is assigned when the component is created in TheStage AI web application and can be found in your TheStage AI account or by listing the components using the CLI.
-
-## **Connecting to server instances and containers**
-
-When connecting to a **rented server instance** or a Docker container hosted on it, the CLI uses the SSH key assigned to that server instance, which is stored in TheStage AI platform. If the instance status is "online" but the connection cannot be established, verify that an SSH key is associated with the server instance. For more information, see [your TheStage AI account > Profile > SSH Keys](https://app.thestage.ai/profile/ssh).
-
-When connecting to a **self-hosted instance** or a Docker container running on it, the CLI requires the username to be specified because it does not have information on which user to use. Ensure that the specified user has SSH access to the server. The instance status must be "online" for a successful connection. For more information, see [TheStage AI Platform: Self-hosted Instances](https://docs.thestage.ai/platform/build/thestage-ai-self-hosted-instances.html).
-
-# Additional Resources
-
-For comprehensive documentation on TheStage AI platform, please visit [TheStage AI Platform Documentation](https://docs.thestage.ai/platform/build/README.html).
-
-For more in-depth information on using TheStage CLI, including command references, please refer to [TheStage AI Platform: CLI](https://docs.thestage.ai/platform/build/thestage-ai-cli.html).
-
-# License
-
+# Introduction
+
+[TheStage AI](https://app.thestage.ai/) is an integrated platform designed for AI researchers, focusing on solving challenges related to accelerating deep neural network (DNN) inference.
+
+**TheStage CLI** provides a command-line interface for interacting with TheStage AI infrastructure, allowing researchers to:
+
+- **Server Instances:** Retrieve information and connect to instances.
+- **Docker Containers:** Manage containers by retrieving information, connecting, streaming real-time logs, uploading/downloading files, and starting/stopping containers.
+- **Projects:** Clone and initialize projects, retrieve project specific task information, run tasks within a project, and stream real-time task logs.
+
+TheStage AI's web-based interface provides full control over managing resources such as creating, renting, deleting components, etc..
+
+# Requirements
+
+TheStage CLI is developed using Python and Poetry. Supported versions are Python 3.9 to 3.12 and Poetry 1.7.1. While the CLI is compatible with various operating systems, we recommend using a Unix-like OS such as Linux or macOS for optimal performance.
+
+**Additional Software Requirements:**
+
+- Git
+- Python 3.9 to 3.12
+- SSH client
+
+These tools must be installed for the CLI to function correctly.
+
+# Authentication and Authorization
+
+To securely connect to TheStage AI's backend and access information about server instances, containers, and more, API tokens are required. These tokens serve as both authentication and authorization mechanisms and can be generated through TheStage AI's web application.
+
+**Note:** An account on TheStage AI is required to generate an API token. Please refer to TheStage AI documentation: TheStage AI Platform: [SSH Keys and API Tokens](https://docs.thestage.ai/platform/build/thestage-ai-ssh-keys-and-api-tokens.html) for more information.
+
+# Installation and Initialization
+
+To generate an API token, please login to your [TheStage AI account](https://app.thestage.ai/sign-in),  and navigate to the Profile > API tokens section. Please refer to [TheStage AI platform documentation](https://docs.thestage.ai/platform/build/thestage-ai-ssh-keys-and-api-tokens.html) for more information.
+
+```python
+# To install TheStage CLI:
+pip install thestage
+
+# To upgrade thestage CLI:
+pip install thestage --upgrade
+
+# To set or change an API token:
+thestage config set --api-token <API_token>
+
+# To get help:
+thestage --help
+```
+
+# Using the CLI
+
+## **Unique IDs**
+
+When working with components of your computational cluster—such as server instances, Docker containers, and projects—the CLI often requires you to specify the unique ID of the component. This unique ID is assigned when the component is created in TheStage AI web application and can be found in your TheStage AI account or by listing the components using the CLI.
+
+## **Connecting to server instances and containers**
+
+When connecting to a **rented server instance** or a Docker container hosted on it, the CLI uses the SSH key assigned to that server instance, which is stored in TheStage AI platform. If the instance status is "online" but the connection cannot be established, verify that an SSH key is associated with the server instance. For more information, see [your TheStage AI account > Profile > SSH Keys](https://app.thestage.ai/profile/ssh).
+
+When connecting to a **self-hosted instance** or a Docker container running on it, the CLI requires the username to be specified because it does not have information on which user to use. Ensure that the specified user has SSH access to the server. The instance status must be "online" for a successful connection. For more information, see [TheStage AI Platform: Self-hosted Instances](https://docs.thestage.ai/platform/build/thestage-ai-self-hosted-instances.html).
+
+# Additional Resources
+
+For comprehensive documentation on TheStage AI platform, please visit [TheStage AI Platform Documentation](https://docs.thestage.ai/platform/build/README.html).
+
+For more in-depth information on using TheStage CLI, including command references, please refer to [TheStage AI Platform: CLI](https://docs.thestage.ai/platform/build/thestage-ai-cli.html).
+
+# License
+
 TheStage CLI is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) (the "License"). You may not use TheStage CLI except in compliance with the License. Unless required by applicable law or agreed to in writing, software distributed under the License is provided on an "as-is" basis, without warranties or conditions of any kind, either express or implied.

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

@@ -1,48 +1,50 @@
-[tool.poetry]
-name = "thestage"
-version = "0.5.46"
-description = ""
-authors = ["TheStage AI team <hello@thestage.ai>"]
-readme = "README.md"
-packages = [
-    { include = "thestage" },
-    { include = "thestage/.env" },
-]
-
-include = [
-    { path = "thestage/.env" },
-]
-
-exclude = [
-    "thestage/.env_example",
-    "thestage/debug_main.py"
-]
-
-[tool.poetry.dependencies]
-python = ">=3.9,<=3.13"
-typer = {extras = ["all"], version = "^0.15.2"}
-tabulate = "^0.9.0"
-python-dotenv = "^1.0.0"
-pydantic = "^2.4.2"
-gitpython = "^3.1.40"
-requests = "^2.31.0"
-python-gettext-translations = "^1.1.0"
-paramiko = "^3.4.0"
-
-aioconsole = "^0.8.0"
-httpx = "^0.27.2"
-boto3 = "^1.35.80"
-
-[tool.poetry.dev-dependencies]
-pytest = "^7.4.3"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.scripts]
-thestage = "thestage.main:main"
-
-[[tool.poetry.source]]
-name = "pypi"
-priority = "primary"
+[tool.poetry]
+name = "thestage"
+
+version = "0.5.49"
+
+description = ""
+authors = ["TheStage AI team <hello@thestage.ai>"]
+readme = "README.md"
+packages = [
+    { include = "thestage" },
+    { include = "thestage/.env" },
+]
+
+include = [
+    { path = "thestage/.env" },
+]
+
+exclude = [
+    "thestage/.env_example",
+    "thestage/debug_main.py"
+]
+
+[tool.poetry.dependencies]
+python = ">=3.9,<=3.13"
+typer = {extras = ["all"], version = "^0.15.2"}
+tabulate = "^0.9.0"
+python-dotenv = "^1.0.0"
+pydantic = "^2.4.2"
+gitpython = "^3.1.40"
+requests = "^2.31.0"
+python-gettext-translations = "^1.1.0"
+paramiko = "^3.5.1"
+
+aioconsole = "^0.8.0"
+httpx = "^0.27.2"
+boto3 = "^1.35.80"
+
+[tool.poetry.dev-dependencies]
+pytest = "^7.4.3"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry.scripts]
+thestage = "thestage.main:main"
+
+[[tool.poetry.source]]
+name = "pypi"
+priority = "primary"

{thestage-0.5.46 → thestage-0.5.49}/thestage/.env

@@ -1,6 +1,5 @@
-THESTAGE_CONFIG_DIR=.thestage
-THESTAGE_CONFIG_FILE=config.json
-THESTAGE_CLI_ENV=DEV
-THESTAGE_API_URL=https://backend-staging.thestage.ai
-THESTAGE_API_URL=https://backend.thestage.ai
-LOG_FILE=thestage.log
+THESTAGE_CONFIG_DIR=.thestage
+THESTAGE_CONFIG_FILE=config.json
+THESTAGE_API_URL=https://backend-staging.thestage.ai
+THESTAGE_API_URL=https://backend.thestage.ai
+LOG_FILE=thestage.log

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

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

{thestage-0.5.46 → thestage-0.5.49}/thestage/__main__.py

@@ -1,9 +1,9 @@
-import thestage.main as main
-
-
-def start():
-    main.main()
-
-
-if __name__ == "__main__":
-    start()
+import thestage.main as main
+
+
+def start():
+    main.main()
+
+
+if __name__ == "__main__":
+    start()

thestage-0.5.49/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.49/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.46 → thestage-0.5.49}/thestage/color_scheme/color_scheme.py

@@ -1,7 +1,7 @@
-from enum import Enum
-
-# https://rich.readthedocs.io/en/stable/appendix/colors.html
-class ColorScheme(str, Enum):
-    GIT_HEADLESS = "orange_red1"
-    WARNING = "orange_red1"
-    USEFUL_INFO = "deep_sky_blue1"
+from enum import Enum
+
+# https://rich.readthedocs.io/en/stable/appendix/colors.html
+class ColorScheme(str, Enum):
+    GIT_HEADLESS = "orange_red1"
+    WARNING = "orange_red1"
+    USEFUL_INFO = "deep_sky_blue1"

{thestage-0.5.46 → thestage-0.5.49}/thestage/config/__init__.py

@@ -1,18 +1,18 @@
-# Init project settings by ENV environment variable
-import locale
-from pathlib import Path
-
-
-from python_gettext_translations.translations import init_translations
-
-from thestage.config.env_base import *
-
-
-THESTAGE_LOCAL_LANGUAGE = 'en_GB'
-if locale.getlocale():
-    THESTAGE_LOCAL_LANGUAGE = locale.getlocale()[0]
-
-translation = Path(f'i18n/')
-
-if translation.exists() and translation.is_dir():
-    init_translations(f'i18n/')
+# Init project settings by ENV environment variable
+import locale
+from pathlib import Path
+
+
+from python_gettext_translations.translations import init_translations
+
+from thestage.config.env_base import *
+
+
+THESTAGE_LOCAL_LANGUAGE = 'en_GB'
+if locale.getlocale():
+    THESTAGE_LOCAL_LANGUAGE = locale.getlocale()[0]
+
+translation = Path(f'i18n/')
+
+if translation.exists() and translation.is_dir():
+    init_translations(f'i18n/')

thestage-0.5.49/thestage/config/config_storage.py

@@ -0,0 +1,5 @@
+from typing import Optional
+
+from thestage.services.core_files.config_entity import ConfigEntity
+
+APP_CONFIG: Optional[ConfigEntity] = None

{thestage-0.5.46 → thestage-0.5.49}/thestage/config/env_base.py

@@ -1,7 +1,7 @@
-import os
-
-THESTAGE_CONFIG_DIR = os.getenv('THESTAGE_CONFIG_DIR', '.thestage')
-THESTAGE_CONFIG_FILE = os.getenv('THESTAGE_CONFIG_FILE', 'config.json')
-THESTAGE_AUTH_TOKEN = os.getenv('THESTAGE_AUTH_TOKEN', None)
-THESTAGE_LOGGING_FILE = os.getenv('THESTAGE_LOGGING_FILE', 'thestage.log')
-THESTAGE_API_URL = os.getenv('THESTAGE_API_URL', 'https://backend.thestage.ai')
+import os
+
+THESTAGE_CONFIG_DIR = os.getenv('THESTAGE_CONFIG_DIR', '.thestage')
+THESTAGE_CONFIG_FILE = os.getenv('THESTAGE_CONFIG_FILE', 'config.json')
+THESTAGE_AUTH_TOKEN = os.getenv('THESTAGE_AUTH_TOKEN', None)
+THESTAGE_LOGGING_FILE = os.getenv('THESTAGE_LOGGING_FILE', 'thestage.log')
+THESTAGE_API_URL = os.getenv('THESTAGE_API_URL', 'https://backend.thestage.ai')

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

@@ -1,63 +1,67 @@
-from pathlib import Path
-from typing import Optional
-
-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
-from thestage import __app_name__, __version__
-
-import typer
-
-from thestage.services.connect.connect_service import ConnectService
-
-app = typer.Typer(no_args_is_help=True)
-
-
-@app.command(no_args_is_help=False)
-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__}))
-    raise typer.Exit(0)
-
-
-@app.command(name="connect", no_args_is_help=True, help=__("Connect to server instance or container using unique ID"))
-def connect(
-        uid: Optional[str] = typer.Argument(
-            help=__("Unique ID of server instance or container"), ),
-        username: Optional[str] = typer.Option(
-            None,
-            '--username',
-            '-u',
-            help=__("Username for the server instance (required when connecting to self-hosted instance)"),
-            is_eager=False,
-        ),
-        private_ssh_key_path: str = typer.Option(
-            None,
-            "--private-key-path",
-            "-pk",
-            help=__("Path to private key that will be accepted by remote server (optional)"),
-            is_eager=False,
-        ),
-):
-    """
-        Connects to entity with a unique ID
-    """
-    app_logger.info(f'Connect to some entity with UID')
-
-    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}')
-        raise typer.Exit(1)
-
-    service_factory = validate_config_and_get_service_factory()
-
-    connect_service: ConnectService = service_factory.get_connect_service()
-
-    connect_service.connect_to_entity(uid=uid, username=username, private_key_path=private_ssh_key_path)
-
-
-    app_logger.info(f'Stop connect to entity')
-    raise typer.Exit(0)
+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
+from thestage import __app_name__, __version__
+
+import typer
+
+from thestage.services.connect.connect_service import ConnectService
+
+app = typer.Typer(no_args_is_help=True,)
+
+
+@app.command(name='version', help="Get application's name and version", no_args_is_help=False, **get_command_metadata(CliCommand.VERSION))
+def 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 or task"), **get_command_metadata(CliCommand.CONNECT))
+def connect(
+        uid: Optional[str] = typer.Argument(
+            help=__("Unique ID of server instance or container or task ID"), ),
+        username: Optional[str] = typer.Option(
+            None,
+            '--username',
+            '-u',
+            help=__("Username for the server instance (required when connecting to self-hosted instance)"),
+            is_eager=False,
+        ),
+        private_ssh_key_path: str = typer.Option(
+            None,
+            "--private-key-path",
+            "-pk",
+            help=__("Path to private key that will be accepted by remote server (optional)"),
+            is_eager=False,
+        ),
+):
+    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}')
+        raise typer.Exit(1)
+
+    service_factory = validate_config_and_get_service_factory()
+
+    connect_service: ConnectService = service_factory.get_connect_service()
+
+    connect_service.connect_to_entity(
+        uid=uid,
+        username=username,
+        private_key_path=private_ssh_key_path
+    )
+
+
+    app_logger.info(f'Stop connect to entity')
+    raise typer.Exit(0)