Add inital model sidebar

Author: fpoms

forager_backend/forager_backend/urls.py

@@ -20,12 +20,17 @@
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("api/start_cluster", views.start_cluster, name="start_cluster"),
+    path(
+        "api/cluster",
+        views.get_cluster_status,
+        name="get_cluster_status",
+    ),
     path(
         "api/cluster/<slug:cluster_id>",
         views.get_cluster_status,
         name="get_cluster_status",
     ),
-    path("api/stop_cluster/<slug:cluster_id>", views.stop_cluster, name="stop_cluster"),
+    path("api/stop_cluster", views.stop_cluster, name="stop_cluster"),
     path("api/get_results/<slug:dataset_name>", views.get_results, name="get_results"),
     path("api/keep_alive", views.keep_alive, name="keep_alive"),
     path("api/generate_embedding", views.generate_embedding, name="generate_embedding"),

forager_backend/forager_backend_api/views.py

@@ -57,8 +57,10 @@ def start_cluster(request):
 
 @api_view(["GET"])
 @csrf_exempt
-def get_cluster_status(request, cluster_id):
-    params = {"cluster_id": cluster_id}
+def get_cluster_status(request, cluster_id=None):
+    params = {}
+    if cluster_id:
+        params["cluster_id":cluster_id]
     r = requests.get(
         settings.EMBEDDING_SERVER_ADDRESS + "/cluster_status", params=params
     )
@@ -68,17 +70,15 @@ def get_cluster_status(request, cluster_id):
 
 @api_view(["POST"])
 @csrf_exempt
-def stop_cluster(request, cluster_id):
-    params = {"cluster_id": cluster_id}
-    requests.post(
+def stop_cluster(request):
+    payload = json.loads(request.body)
+    params = dict(cluster_id=payload["cluster_id"])
+    r = requests.post(
         settings.EMBEDDING_SERVER_ADDRESS + "/stop_cluster",
         json=params,
     )
-    return JsonResponse(
-        {
-            "status": "success",
-        }
-    )
+    response_data = r.json()
+    return JsonResponse(response_data)
 
 
 #

forager_embedding_server/src/app.py

@@ -16,32 +16,21 @@
 import numpy as np
 import sanic.response as resp
 from forager_embedding_server.ais import ais_singleiter, get_fscore
+from forager_embedding_server.bgsplit_jobs import (BGSplitInferenceJob,
+                                                   BGSplitTrainingJob, Trainer)
 from forager_embedding_server.config import CONFIG
 from forager_embedding_server.embedding_jobs import EmbeddingInferenceJob
-from forager_embedding_server.jobs_data import (
-    ImageList,
-    QueryResult,
-    load_embedding_set,
-    load_score_set,
-)
+from forager_embedding_server.jobs_data import (ImageList, QueryResult,
+                                                load_embedding_set,
+                                                load_score_set)
 from forager_embedding_server.utils import CleanupDict
 from forager_knn import utils
+from forager_knn.clusters import TerraformModule
 from PIL import Image
 from sanic import Sanic
 from sklearn import svm
 from sklearn.metrics import precision_score, recall_score
 
-BUILD_WITH_KUBE = False
-
-if BUILD_WITH_KUBE:
-    from forager_knn.clusters import TerraformModule
-
-    from forager_embedding_server.bgsplit_jobs import (
-        BGSplitInferenceJob,
-        BGSplitTrainingJob,
-        Trainer,
-    )
-
 # Create a logger for the server
 
 forager_embedding_server.log.init_logging()
@@ -179,19 +168,13 @@ async def _stop_cluster(cluster):
 
 
 # TODO(mihirg): Automatically clean up inactive clusters
-if BUILD_WITH_KUBE:
-    current_clusters: CleanupDict[str, TerraformModule] = CleanupDict(
-        _stop_cluster, app.add_task, CONFIG.CLUSTER.CLEANUP_TIME
-    )
-else:
-    current_clusters = {}
+current_clusters: CleanupDict[str, TerraformModule] = CleanupDict(
+    _stop_cluster, app.add_task, CONFIG.CLUSTER.CLEANUP_TIME
+)
 
 
 @app.route("/start_cluster", methods=["POST"])
 async def start_cluster(request):
-    if not BUILD_WITH_KUBE:
-        return resp.json({"success": False}, status=400)
-
     cluster = TerraformModule(
         CONFIG.CLUSTER.TERRAFORM_MODULE_PATH, copy=not CONFIG.CLUSTER.REUSE_EXISTING
     )
@@ -203,14 +186,32 @@ async def start_cluster(request):
 
 @app.route("/cluster_status", methods=["GET"])
 async def cluster_status(request):
-    cluster_id = request.args["cluster_id"][0]
-    cluster = current_clusters.get(cluster_id)
-    has_cluster = cluster is not None
+    if "cluster_id" in request.args:
+        cluster_id = request.args["cluster_id"][0]
+        cluster = current_clusters.get(cluster_id)
+        has_cluster = cluster is not None
+        status = {
+            "has_cluster": has_cluster,
+            "ready": has_cluster and cluster.ready.is_set(),
+        }
+    else:
+        status = {"clusters": []}
+        for cluster_id, cluster in current_clusters.items():
+            state = "creating"
+            if cluster.ready.is_set():
+                state = "ready"
+            if cluster.destroying.is_set():
+                state = "destroying"
+            status["clusters"].append(
+                {
+                    "id": cluster_id,
+                    "name": "tbd",
+                    "created_at": "N/A",
+                    "created_by": "N/A",
+                    "status": state,
+                }
+            )
 
-    status = {
-        "has_cluster": has_cluster,
-        "ready": has_cluster and cluster.ready.is_set(),
-    }
     return resp.json(status)
 
 
@@ -226,12 +227,9 @@ async def stop_cluster(request):
 # Note(mihirg): These functions are out of date as of 6/25 and need to be fixed/removed.
 #
 
-if BUILD_WITH_KUBE:
-    current_models: CleanupDict[str, BGSplitTrainingJob] = CleanupDict(
-        lambda job: job.stop()
-    )
-else:
-    current_models = {}
+current_models: CleanupDict[str, BGSplitTrainingJob] = CleanupDict(
+    lambda job: job.stop()
+)
 
 
 @app.route("/start_bgsplit_job", methods=["POST"])
@@ -386,12 +384,9 @@ async def bgsplit_job_status(request):
     return resp.json(status)
 
 
-if BUILD_WITH_KUBE:
-    current_model_inference_jobs: CleanupDict[str, BGSplitInferenceJob] = CleanupDict(
-        lambda job: job.stop()
-    )
-else:
-    current_model_inference_jobs = {}
+current_model_inference_jobs: CleanupDict[str, BGSplitInferenceJob] = CleanupDict(
+    lambda job: job.stop()
+)
 
 
 @app.route("/start_bgsplit_inference_job", methods=["POST"])
@@ -748,10 +743,9 @@ async def cleanup(app, loop):
 
 @utils.log_exception_from_coro_but_return_none
 async def _cleanup_clusters():
-    if BUILD_WITH_KUBE:
-        n = len(current_clusters)
-        await current_clusters.clear_async()
-        print(f"- killed {n} clusters")
+    n = len(current_clusters)
+    await current_clusters.clear_async()
+    print(f"- killed {n} clusters")
 
 
 if __name__ == "__main__":

forager_frontend/src/node/package.json

@@ -6,6 +6,10 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.34",
     "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fortawesome/react-fontawesome": "^0.1.15",
+    "@types/jest": "^27.0.2",
+    "@types/node": "^16.10.2",
+    "@types/react": "^17.0.26",
+    "@types/react-dom": "^17.0.9",
     "browser-image-resizer": "^2.2.0",
     "classnames": "^2.3.1",
     "dateformat": "^4.5.1",
@@ -30,6 +34,7 @@
     "react-useinterval": "^1.0.2",
     "reactstrap": "^8.7.1",
     "styled-components": "^5.2.1",
+    "typescript": "^4.4.3",
     "use-image": "^1.0.7",
     "use-resize-observer": "^7.0.0",
     "uuid": "^8.3.2"
@@ -55,5 +60,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "devDependencies": {
+    "prettier": "^2.4.1"
   }
 }