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

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

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

{oak_cli-0.3.4 → oak_cli-0.3.5}/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.5/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.5}/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.5}/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.5}/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.5}/pyproject.toml

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