Use faasmctl to interact with a Faasm deployment (#118)

* tasks: use faasmctl instead of faasmtools

* gh: bump code version to ship packages with faasmctl installed

* req: bump faasmctl version

* bin: instlal faasmtools in editable mode as part of creating venvs

* docker: simplify python set-up

* req: bump faasmctl version

Author: csegarragonz

.env

@@ -1,3 +1,3 @@
-SYSROOT_VERSION=0.2.7
-SYSROOT_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.2.7
+SYSROOT_VERSION=0.2.8
+SYSROOT_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.2.8
 COMPOSE_PROJECT_NAME=cpp-dev

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cpp-sysroot:0.2.7
+      image: faasm.azurecr.io/cpp-sysroot:0.2.8
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}

VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

bin/create_venv.sh

@@ -29,6 +29,8 @@ fi
 pip_cmd install -U pip
 pip_cmd install -U setuptools wheel
 pip_cmd install -r requirements.txt
+# Install faasmtools in editable mode
+pip_cmd install -e .
 
 touch ${VENV_PATH}/faasm_venv.BUILT
 

docker/cpp-sysroot.dockerfile

@@ -25,12 +25,9 @@ RUN mkdir -p /code \
     && git submodule update --init -f third-party/wasi-libc \
     && git submodule update --init -f third-party/zlib
 
-# Install the faasmtools Python lib
+# Python set-up
 RUN cd /code/cpp \
-    && ./bin/create_venv.sh \
-    && source venv/bin/activate \
-    && pip3 install -r requirements.txt \
-    && pip3 install .
+    && ./bin/create_venv.sh
 
 # Build all the targets
 RUN cd /code/cpp \

requirements.txt

@@ -1,4 +1,5 @@
 black==22.3.0
+faasmctl==0.3.5
 flake8==4.0.1
-invoke==1.7.1
-requests==2.25.1
+invoke>=2.0.0
+requests>=2.31.0

tasks/func.py

@@ -1,21 +1,14 @@
 from base64 import b64encode
+from faasmctl.util.flush import flush_workers
+from faasmctl.util.invoke import invoke_wasm
+from faasmctl.util.upload import upload_wasm
+from faasmtools.env import PROJ_ROOT
+from faasmtools.compile_util import wasm_cmake, wasm_copy_upload
+from invoke import task
 from os import makedirs, listdir
 from os.path import join, exists, splitext
 from shutil import rmtree
 from subprocess import run
-import requests
-from invoke import task
-
-from faasmtools.env import PROJ_ROOT
-from faasmtools.endpoints import (
-    get_faasm_invoke_host_port,
-    get_faasm_planner_host_port,
-    get_faasm_upload_host_port,
-    get_knative_headers,
-)
-from faasmtools.compile_util import wasm_cmake, wasm_copy_upload
-
-FAABRIC_MSG_TYPE_FLUSH = 3
 
 FUNC_DIR = join(PROJ_ROOT, "func")
 FUNC_BUILD_DIR = join(PROJ_ROOT, "build", "func")
@@ -82,12 +75,8 @@ def upload(ctx, user, func):
     """
     Upload a compiled function
     """
-    host, port = get_faasm_upload_host_port()
     func_file = join(FUNC_BUILD_DIR, user, "{}.wasm".format(func))
-    url = "http://{}:{}/f/{}/{}".format(host, port, user, func)
-    response = requests.put(url, data=open(func_file, "rb"))
-
-    print("Response {}: {}".format(response.status_code, response.text))
+    upload_wasm(user, func, func_file)
 
 
 @task
@@ -105,8 +94,7 @@ def invoke(ctx, user, func, input_data=None, mpi=None, graph=False):
     """
     Invoke a given function
     """
-    host, port = get_faasm_invoke_host_port()
-    url = "http://{}:{}".format(host, port)
+    # Prepare Faasm message
     data = {
         "function": func,
         "user": user,
@@ -124,14 +112,10 @@ def invoke(ctx, user, func, input_data=None, mpi=None, graph=False):
         data["record_exec_graph"] = True
         data["async"] = True
 
-    headers = get_knative_headers()
-    response = requests.post(url, json=data, headers=headers)
+    # Invoke message
+    response = invoke_wasm(data)
 
-    if response.status_code != 200:
-        print("Error ({}):\n{}".format(response.status_code, response.text))
-        exit(1)
-
-    print("Success:\n{}".format(response.text))
+    print("Success:\n{}".format(response.messageResults[0].outputData))
 
 
 @task
@@ -151,14 +135,7 @@ def flush(ctx):
     """
     Flush the Faasm cluster
     """
-    headers = get_knative_headers()
-    host, port = get_faasm_planner_host_port()
-
-    url = "http://{}:{}".format(host, port)
-    data = {"type": FAABRIC_MSG_TYPE_FLUSH}
-    response = requests.post(url, json=data, headers=headers)
-
-    print("Flush response {}: {}".format(response.status_code, response.text))
+    flush_workers()
 
 
 @task