oak-cli 0.3.4__tar.gz → 0.3.6__tar.gz

{oak_cli-0.3.4 → oak_cli-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oak_cli
-Version: 0.3.4
+Version: 0.3.6
 Summary: 
 Author: Alexander Malyuk
 Author-email: malyuk.alexander1999@gmail.com

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/addons/flops/SLAs/projects/common.py

@@ -7,6 +7,7 @@ class FLOpsProjectSLAs(FLOpsSLAs):
     CIFAR10_KERAS = "cifar10_keras"
     CIFAR10_PYTORCH = "cifar10_pytorch"
     MNIST_SKLEARN_SMALL = "mnist_sklearn_small"
+    HIERARCHICAL_MNIST_SKLEARN_SMALL = "hierarchical_mnist_sklearn_small"
     MNIST_SKLEARN_LARGE = "mnist_sklearn_large"
 
     # Note: This should be refactored and placed in the common parent class.

oak_cli-0.3.6/oak_cli/addons/flops/SLAs/projects/hierarchical_mnist_sklearn_small.SLA.json

@@ -0,0 +1,22 @@
+{
+    "verbose": true,
+    "customerID": "Admin",
+    "ml_repo_url": "https://github.com/Malyuk-A/flops_ml_repo_mnist_sklearn",
+    "ml_model_flavor": "sklearn",
+    "use_devel_base_images": true,
+    "training_configuration": {
+        "mode": "hierarchical",
+        "data_tags": ["mnist"],
+        "training_cycles": 2,
+        "training_rounds": 3,
+        "min_available_learners":2,
+        "min_fit_learners": 2,
+        "min_evaluate_learners": 2
+    },
+    "post_training_steps": ["build_image_for_trained_model", "deploy_trained_model_image"],
+    "resource_constraints": {
+        "memory": 100,
+        "vcpus": 1,
+        "storage": 0
+    }
+}

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/addons/flops/SLAs/projects/mnist_sklearn_small.SLA.json

@@ -5,11 +5,12 @@
     "ml_model_flavor": "sklearn",
     "use_devel_base_images": true,
     "training_configuration": {
+        "mode": "classic",
         "data_tags": ["mnist"],
         "training_rounds": 2,
-        "min_available_clients":2,
-        "min_fit_clients": 2,
-        "min_evaluate_clients": 2
+        "min_available_learners":2,
+        "min_fit_learners": 2,
+        "min_evaluate_learners": 2
     },
     "post_training_steps": ["build_image_for_trained_model", "deploy_trained_model_image"],
     "resource_constraints": {

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/ansible/playbooks/install_fundamentals.yml

@@ -1,4 +1,4 @@
-- name: Install Fundamental non-python dependencies for Oakestra, including Git, Docker, and Docker Compose, etc.
+- name: Install Fundamental non-python dependencies for Oakestra, including Git, Docker (with Compose), and Go, etc.
   hosts: localhost
   become: yes
 
@@ -22,5 +22,5 @@
     - role: geerlingguy.docker 
       vars:
         docker_install_compose: true
-
-# TODO / Future Work: Add Golang installation role/task
+    # Install Go
+    - role: gantsign.golang

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/apps/SLAs/dummy_tester.SLA.json

@@ -10,7 +10,7 @@
             "microservices": [
                 {
                     "microserviceID": "",
-                    "microservice_name": "curl",
+                    "microservice_name": "curl2",
                     "microservice_namespace": "test",
                     "virtualization": "container",
                     "cmd": [
@@ -28,7 +28,15 @@
                     "code": "docker.io/curlimages/curl:7.82.0",
                     "state": "",
                     "port": "9080",
-                    "added_files": []
+                    "added_files": [],
+                    "constraints":[
+                        {
+                            "type":"clusters",
+                            "allowed": [
+                                "fictional_cluster"
+                            ]
+                        }
+                    ]
                 },
                 {
                     "microserviceID": "",
@@ -52,9 +60,9 @@
                     "added_files": [],
                     "constraints":[
                         {
-                            "type":"addons",
-                            "needs": [
-                                "FLOps-learner"
+                            "type":"clusters",
+                            "allowed": [
+                                "alex_cluster"
                             ]
                         }
                     ]

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/installer/main.py

@@ -4,6 +4,8 @@ import typer
 from oak_cli.ansible.python_utils import CliPlaybook
 from oak_cli.utils.common import run_in_shell
 
+ANSIBLE_GALAXY_ROLES = " ".join(("geerlingguy.docker", "gantsign.golang"))
+
 app = typer.Typer()
 
 
@@ -15,7 +17,7 @@ app = typer.Typer()
     """,
 )
 def install_fundamentals() -> None:
-    # NOTE: The following playbook requires a ansible-galaxy role to be installed on the machine.
+    # NOTE: The following playbook requires ansible-galaxy roles to be installed on the machine.
     # Installing it via a dedicated playbook does not work due to ansible-access right issues.
-    run_in_shell(shell_cmd="ansible-galaxy install geerlingguy.docker")
+    run_in_shell(shell_cmd=f"ansible-galaxy install {ANSIBLE_GALAXY_ROLES}")
     ansible_runner.run(playbook=CliPlaybook.INSTALL_FUNDAMENTALS.get_path())

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/main.py

@@ -16,6 +16,7 @@ from oak_cli.configuration.local_machine_purpose import (
     LocalMachinePurpose,
     check_if_local_machine_has_required_purposes,
 )
+from oak_cli.utils.common import get_env_var
 from oak_cli.utils.logging import logger
 from oak_cli.utils.typer_augmentations import AliasGroup, typer_help_text
 
@@ -99,6 +100,12 @@ def show_version():
     logger.info(f"OAK-CLI version: '{version('oak_cli')}'")
 
 
+@app.command("api-docs", help="Shows a links to the Swagger api-docs for Oakestra.")
+def show_api_docs():
+    api_docs_link = f"http://{get_env_var('SYSTEM_MANAGER_URL')}:1000/api/docs"
+    logger.info(f"Oakestra root API docs: '{api_docs_link}'")
+
+
 def main():
     app()
 

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/services/auxiliary.py

@@ -85,7 +85,11 @@ def generate_current_services_table(
         caption += f" of app: '{app_name} - {app_id}'"
     table = create_table(caption=caption, verbosity=verbosity, live=live)
     add_column(table, column_name="Service Name", style=OAK_GREEN)
-    add_column(table, column_name="Service ID")
+    add_column(
+        table,
+        column_name="Service ID",
+        no_wrap=(verbosity == Verbosity.SIMPLE),
+    )
     if verbosity == Verbosity.DETAILED:
         add_column(table, column_name="Status", style=OAK_WHITE)
     add_column(table, column_name="Instances", style=OAK_WHITE, no_wrap=True)

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/utils/common.py

@@ -18,6 +18,9 @@ def run_in_shell(
     capture_output: bool = True,
     check: bool = True,
     text: bool = False,
+    # NOTE: subprocess.run usually expects an array of strings as the cmd.
+    # It is not able to handle pipes ("|"), etc.
+    # If shell=True is enabled then it expects a single string as cmd and can handle pipes, etc.
     pure_shell: bool = False,
 ) -> subprocess.CompletedProcess[bytes]:
     return subprocess.run(

oak_cli-0.3.6/oak_cli/worker/main.py

@@ -0,0 +1,28 @@
+import typer
+
+import oak_cli.worker.ctr
+import oak_cli.worker.net_manager
+import oak_cli.worker.node_engine
+from oak_cli.utils.typer_augmentations import typer_help_text
+from oak_cli.worker.net_manager import NET_MANAGER_NAME
+from oak_cli.worker.node_engine import NODE_ENGINE_NAME
+
+app = typer.Typer()
+
+app.add_typer(
+    typer_instance=oak_cli.worker.ctr.app,
+    name="ctr",
+    help=typer_help_text("ctr"),
+)
+
+app.add_typer(
+    typer_instance=oak_cli.worker.net_manager.app,
+    name="net-manager",
+    help=typer_help_text(NET_MANAGER_NAME),
+)
+
+app.add_typer(
+    typer_instance=oak_cli.worker.node_engine.app,
+    name="node-engine",
+    help=typer_help_text(NODE_ENGINE_NAME),
+)

{oak_cli-0.3.4 → oak_cli-0.3.6}/oak_cli/worker/node_engine.py

@@ -1,20 +1,33 @@
+import enum
+import os
 from typing import Optional
 
 import typer
 from typing_extensions import Annotated
 
+from oak_cli.configuration.local_machine_purpose import (
+    LocalMachinePurpose,
+    check_if_local_machine_has_required_purposes,
+)
+from oak_cli.configuration.main_oak_repo import get_main_oak_repo_path_from_config
 from oak_cli.utils.common import get_env_var, run_in_shell
 from oak_cli.utils.logging import logger
 from oak_cli.utils.typer_augmentations import AliasGroup
 from oak_cli.worker.common import ProcessStatus, get_process_status, stop_process
 
-app = typer.Typer(cls=AliasGroup)
+
+class Architecture(enum.Enum):
+    AMD64 = "amd64"
+    ARM64 = "arm64"
 
 
 NODE_ENGINE_NAME = "NodeEngine"
 NODE_ENGINE_CMD_PREFIX = f"sudo {NODE_ENGINE_NAME}"
 
 
+app = typer.Typer(cls=AliasGroup)
+
+
 @app.command("start", help=f"Starts the {NODE_ENGINE_NAME}.")
 def start_node_engine(
     use_ml_data_server_for_flops_addon_learner: Annotated[
@@ -43,3 +56,27 @@ def get_node_engine_status(print_status: bool = True) -> ProcessStatus:
 @app.command("stop", help=f"stops the {NODE_ENGINE_NAME}.")
 def stop_node_engine() -> None:
     stop_process(process_cmd=NODE_ENGINE_CMD_PREFIX, process_name=NODE_ENGINE_NAME)
+
+
+if check_if_local_machine_has_required_purposes(
+    required_purposes=[LocalMachinePurpose.DEVELOPMENT]
+):
+    # TODO: Figure out architecture automatically.
+    @app.command(
+        "rebuild",
+        help=f"rebuilds (and restarts) the {NODE_ENGINE_NAME}.",
+    )
+    def rebuild_node_engine(
+        architecture: Architecture = Architecture.AMD64, restart: bool = True
+    ) -> None:
+        if restart:
+            stop_node_engine()
+
+        node_engine_build_path = get_main_oak_repo_path_from_config() / "go_node_engine" / "build"
+        os.chdir(node_engine_build_path)
+        run_in_shell(shell_cmd="./build.sh")
+        run_in_shell(shell_cmd=f". install.sh {architecture.value}")
+        logger.info("Successfully rebuild the NodeEngine.")
+
+        if restart:
+            start_node_engine()

{oak_cli-0.3.4 → oak_cli-0.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oak_cli"
-version = "0.3.4"
+version = "0.3.6"
 description = ""
 authors = ["Alexander Malyuk <malyuk.alexander1999@gmail.com>"]
 readme = "README.md"

oak_cli-0.3.4/oak_cli/worker/main.py

@@ -1,32 +0,0 @@
-import typer
-
-import oak_cli.worker.ctr
-import oak_cli.worker.net_manager
-import oak_cli.worker.node_engine
-from oak_cli.utils.typer_augmentations import typer_help_text
-
-# from oak_cli.worker.net_manager import NET_MANAGER_NAME
-# from oak_cli.worker.node_engine import NODE_ENGINE_NAME
-
-app = typer.Typer()
-
-app.add_typer(
-    typer_instance=oak_cli.worker.ctr.app,
-    name="ctr",
-    help=typer_help_text("ctr"),
-)
-
-# TODO Both work but are very flaky for what-ever reason.
-# So to avoid flaky/buggy commands they are commented out for now.
-
-# app.add_typer(
-#     typer_instance=oak_cli.worker.net_manager.app,
-#     name="net-manager",
-#     help=typer_help_text(NET_MANAGER_NAME),
-# )
-
-# app.add_typer(
-#     typer_instance=oak_cli.worker.node_engine.app,
-#     name="node-engine",
-#     help=typer_help_text(NODE_ENGINE_NAME),
-# )