694 lab 665 lab 653 add view to update job flow (#696)

Co-authored-by: alabdao <139594838+alabdao@users.noreply.github.com>

Author: thetechnocrat-dev

.github/actions/gateway-tests/action.yml

@@ -105,10 +105,13 @@ runs:
                -d "$payload")
 
         # Extract the CID from the response
+        echo "$response"
         cid_value=$(echo "$response" | jq -r '.cid')
+        echo "$response" | jq -r '.cid'
 
         # Check if the CID exists
         if [[ ! -z "$cid_value" && "$cid_value" != "null" ]]; then
+           echo "$response" | jq -r '.cid'
            echo "Create Flow test passed"
         else
            echo "Create Flow test failed: CID not found in the response"

.github/workflows/ci.yml

@@ -110,7 +110,6 @@ jobs:
           - ubuntu-22.04
           # - macos-13
         bacalhau_version:
-          - 1.0.3
           - 1.1.0
     runs-on: ${{ matrix.os }}
     environment: ci
@@ -142,7 +141,6 @@ jobs:
           - ubuntu-22.04
           # - macos-13
         bacalhau_version:
-          - 1.0.3
           - 1.1.0
     runs-on: ${{ matrix.os }}
     environment: ci
@@ -205,29 +203,24 @@ jobs:
           NEXT_PUBLIC_PRIVY_APP_ID: ${{ secrets.NEXT_PUBLIC_PRIVY_APP_ID }}
 
       - name: Bring up the stack
-        if: matrix.bacalhau_version == '1.0.3'
         run: |
           # Setup docker compose
           docker compose up -d --wait
         env:
           NEXT_PUBLIC_PRIVY_APP_ID: ${{ secrets.NEXT_PUBLIC_PRIVY_APP_ID }}
 
-      - name: Bring up the stack
-        if: matrix.bacalhau_version == '1.1.0'
-        run: |
-          # Setup docker compose 1.1.0
-          docker compose -f docker-compose.yml -f docker-compose.1.1.0.yml up -d --wait
-        env:
-          NEXT_PUBLIC_PRIVY_APP_ID: ${{ secrets.NEXT_PUBLIC_PRIVY_APP_ID }}
-
       - name: Run docker compose ps
         run: |
           # Inspect number of running containers
           docker compose ps
 
       - name: Run Equibind
-        if: matrix.bacalhau_version == '1.0.3'
         run: |
+          # point towards prod env until docker in docker job launcher is fixed
+          export BACALHAU_API_HOST=bacalhau.prod.labdao.xyz
+          chmod +x ./bacalhau
+          ./bacalhau version
+
           # Add execute permission
           chmod +x plex
 
@@ -241,16 +234,25 @@ jobs:
             find . -name '*docked.sdf' | grep 'docked.sdf'
           fi
 
+          # revert back to local host for any other steps
+          export BACALHAU_API_HOST="127.0.0.1"
+
       - name: Run bacalhau describe
-        if: matrix.bacalhau_version == '1.0.3'
         # run always even when
+        if: always()
         run: |
+          # point towards prod env until docker in docker job launcher is fixed
+          export BACALHAU_API_HOST=bacalhau.prod.labdao.xyz
+
           # Execute permission
           chmod +x ./bacalhau
           ./bacalhau version
           JOB_ID=$(./bacalhau list --output json | jq -r '.[0].State.JobID')
           ./bacalhau describe ${JOB_ID}
 
+          # revert back to local host for any other steps
+          export BACALHAU_API_HOST="127.0.0.1"
+
       - name: Run Gateway Integration Tests
         uses: ./.github/actions/gateway-tests
 
@@ -282,7 +284,6 @@ jobs:
           - ubuntu-22.04
           # -  macos-13
         bacalhau_version:
-          - 1.0.3
           - 1.1.0
     runs-on: ${{ matrix.os }}
     environment: ci
@@ -350,28 +351,20 @@ jobs:
           NEXT_PUBLIC_PRIVY_APP_ID: ${{ secrets.NEXT_PUBLIC_PRIVY_APP_ID }}
 
       - name: Bring up the stack
-        if: matrix.bacalhau_version == '1.0.3'
         run: |
           # Setup docker compose private
           docker compose -f docker-compose.yml -f docker-compose.private.yml up -d --wait
         env:
           NEXT_PUBLIC_PRIVY_APP_ID: ${{ secrets.NEXT_PUBLIC_PRIVY_APP_ID }}
 
-      - name: Bring up the stack
-        if: matrix.bacalhau_version == '1.1.0'
-        run: |
-          # Setup docker compose private
-          docker compose -f docker-compose.yml -f docker-compose.1.1.0.yml -f docker-compose.private.yml up -d --wait
-        env:
-          NEXT_PUBLIC_PRIVY_APP_ID: ${{ secrets.NEXT_PUBLIC_PRIVY_APP_ID }}
-
       - name: Run docker compose ps
         run: |
           # Inspect number of running containers
           docker compose ps
 
       - name: Run Equibind
-        if: matrix.bacalhau_version == '1.0.3'
+        # turn back on once baclahau docker in docker job launcher is fixed
+        if: false
         run: |
           set -x
           # Add execute permission
@@ -403,7 +396,8 @@ jobs:
           fi
 
       - name: Run bacalhau describe
-        if: matrix.bacalhau_version == '1.0.3'
+        # turn back on once baclahau docker in docker job launcher is fixed
+        if: false
         run: |
           # Execute permission
           chmod +x ./bacalhau

Dockerfile

@@ -1,16 +1,21 @@
 FROM golang:1.20-buster as builder
- 
+
+ARG BACALHAU_VERSION=1.1.1
+
 # Install deps
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
   libssl-dev \
   ca-certificates \
   fuse
 
 COPY . /app/
-RUN cd /app/ \
-    && CGO_ENABLED=0 go build -o /go/bin/plex
+WORKDIR /app/
+RUN CGO_ENABLED=0 go build -o /go/bin/plex
 
-RUN apt-get update && apt-get -y install ca-certificates
+# Download bacalhau cli
+ADD https://github.com/bacalhau-project/bacalhau/releases/download/v${BACALHAU_VERSION}/bacalhau_v${BACALHAU_VERSION}_linux_amd64.tar.gz /tmp/bacalhau.tgz
+
+RUN tar -zxvf /tmp/bacalhau.tgz -C /usr/local/bin/
 
 FROM busybox:1.31.1-glibc
 
@@ -28,7 +33,7 @@ COPY --from=quay.io/labdao/ipfs@sha256:461646b6ea97dffc86b1816380360be3d38d5a2c6
 COPY docker/images/ipfs/container-init.d /container-init.d
 
 # init.d script IPFS runs before starting the daemon. Used to manipulate the IPFS config file.
-COPY docker/images/backend/docker-entrypoint.sh /docker-entrypoint.sh
+COPY --chmod=0755 docker/images/backend/docker-entrypoint.sh /docker-entrypoint.sh
 
 # Copy jq
 COPY --from=ghcr.io/jqlang/jq /jq /usr/local/bin/jq
@@ -40,10 +45,14 @@ COPY --from=builder /lib/*-linux-gnu*/libdl.so.2 /lib/
 COPY --from=builder /usr/lib/*-linux-gnu*/libssl.so* /usr/lib/
 COPY --from=builder /usr/lib/*-linux-gnu*/libcrypto.so* /usr/lib/
 
-RUN chmod +x /docker-entrypoint.sh
+# COPY bacalhau cli
+COPY --from=builder --chmod=755 /usr/local/bin/bacalhau /usr/local/bin/bacalhau
 
 RUN mkdir -p /data/ipfs
 
+# This creates config file needed by bacalhau golang client
+RUN /usr/local/bin/bacalhau version
+
 ENV POSTGRES_PASSWORD=MAKE_UP_SOMETHING_RANDOM
 ENV POSTGRES_USER=labdao
 ENV POSTGRES_DB=labdao

docker-compose.1.1.0.yml

@@ -9,13 +9,13 @@ services:
     command: >
       sh -c '
       mkdir -p /home/nonroot/.bacalhau &&
-      echo CAASqAkwggSkAgEAAoIBAQDQubr6zD3DLEQ07K2wPUQEFfVQLfqTQihc8lQOWuihElXcqZJLajK4od5zc+nCQ/jyUmrmOsYd7aKBmXfyTwOBwCaXEpqqxlP+Pal/Ruh+Ptpfl11KP4sHg3P5sYM/bMRJrEtg1k3mbaToioH5I9GrH7zv5LDHUSezbYFCJ4ZyakUgal+GXPx+TpbdhIx93pZXPHzxgd/m1rbSyiR7sUqXAokzKf2Qv1sOnGrHHcKy8DiSrXo+YUyDRC3lQKwaSfyrBFq1BLqE+E383zYIc5yhcV3kSGivQ2v9o67jEbss3f3ogEfXplsAnBh1S+RfcfneUaRs/UC/+8kyWAC0sU1ZAgMBAAECggEAHZZWZPrSvnnl6UKrlFH69EFQlt8NqBY2toY7WBWW6E47EZ6P+FTDf9yiNed2eW09OsxoDt7B+rgW0xw4HocIzjm4vq2Kcy7N9To0brBUgKDUP7yrIr1DLft6UyjQnAsFABSGUuHOBR4BxFzt860aKZHELJVUYcylPhAFxKTpsAoSy68/Zfkz5wjGtC/ImcHIwGub7NKNmbouQQe6p4beOkYmyVsX6RL/7RPMi7Jvspq0nj0V0j/T13XBUH4b862cqs54HuJQjI9j4QijA9SuCySXQfJw2If8sM7z/3w+IwYhp2JIu4oMTIppCvTBgzAmh+7OMqfOlL7av9iMmqQiAQKBgQDyDtX4TxN1JiFdJg8L3AV8e53GE2eAGY7zpiN7CDrACDXeyrni8fIVz4wY5Pf7+E49dI1S67dsyHVb2dK6Gg4tyECXoRHYPMRktw8LJf9QfCfYsGrpoj/yq2UZ5SqU1Uh70h3b7W3vdZXPZO1BBzT2iwTPGQl/0I0bunSTl72gYQKBgQDcv2etOyDp72NaiZduLpia0RVc92MAZLyoWyq4rscfjU0MvkCPyTa6sKjF2uaUDS5R8yVHB/6+2Mzs4LuWWpNtp6b3rG88CXxfbGDIYn2BOXDqQ9s2/ceISkNMq+NbfcUbbNvG920Ot20VKjkl9s7LcEC0cLiVU14oWd8BOV6v+QKBgQDWOk8g7ktYOSD6Ib7bTiUE4RrnvTCy7OvZs8ZfEw97+UhEH8OYmW0Z5JAnUC4xsLb+KPMS2k+CVX+YhRW9Y2X9GugfyovShyWBxYno4f4uq1NQsgJNOC3EhfB6lJm1E3aNL48BoAbWEYk+/iIElW5IbQ0ahRwlJNxeGA0ouvk2wQKBgQDZYfwdEa9V8BItJHXlYSmSu/eHt27dAlbui+jEOgmJPsLzm59EeWfV7QYm4WxTu68zsHezPWJWWnVjh+PzKnsobwLzv/FCdCzwY2/jpWnmicRyTiRgQQXvZwJjTJn2jSI/4bGEfD//UA6x2wSwKB55JK/zgVWkZ5a/sdD0CaT/MQKBgA7CMHQIjXl8FqATmBgiejGV6BnbUHko4m0Ab7fQUZY1qlgKrqcXgFmMQkb+p8Og1YeVn8Qy8xuvueAfwemA8OxvLuQNzQcA2qhGZID4Tu2Ng+XIkNxMj1gJelppqVeDnZSFr3TbZcSXIVhk1idAnpGDilS8cOO6LUY/hH/IVGGe > /home/nonroot/.bacalhau/private_key.1235 &&
+      echo CAASqAkwggSkAgEAAoIBAQDQubr6zD3DLEQ07K2wPUQEFfVQLfqTQihc8lQOWuihElXcqZJLajK4od5zc+nCQ/jyUmrmOsYd7aKBmXfyTwOBwCaXEpqqxlP+Pal/Ruh+Ptpfl11KP4sHg3P5sYM/bMRJrEtg1k3mbaToioH5I9GrH7zv5LDHUSezbYFCJ4ZyakUgal+GXPx+TpbdhIx93pZXPHzxgd/m1rbSyiR7sUqXAokzKf2Qv1sOnGrHHcKy8DiSrXo+YUyDRC3lQKwaSfyrBFq1BLqE+E383zYIc5yhcV3kSGivQ2v9o67jEbss3f3ogEfXplsAnBh1S+RfcfneUaRs/UC/+8kyWAC0sU1ZAgMBAAECggEAHZZWZPrSvnnl6UKrlFH69EFQlt8NqBY2toY7WBWW6E47EZ6P+FTDf9yiNed2eW09OsxoDt7B+rgW0xw4HocIzjm4vq2Kcy7N9To0brBUgKDUP7yrIr1DLft6UyjQnAsFABSGUuHOBR4BxFzt860aKZHELJVUYcylPhAFxKTpsAoSy68/Zfkz5wjGtC/ImcHIwGub7NKNmbouQQe6p4beOkYmyVsX6RL/7RPMi7Jvspq0nj0V0j/T13XBUH4b862cqs54HuJQjI9j4QijA9SuCySXQfJw2If8sM7z/3w+IwYhp2JIu4oMTIppCvTBgzAmh+7OMqfOlL7av9iMmqQiAQKBgQDyDtX4TxN1JiFdJg8L3AV8e53GE2eAGY7zpiN7CDrACDXeyrni8fIVz4wY5Pf7+E49dI1S67dsyHVb2dK6Gg4tyECXoRHYPMRktw8LJf9QfCfYsGrpoj/yq2UZ5SqU1Uh70h3b7W3vdZXPZO1BBzT2iwTPGQl/0I0bunSTl72gYQKBgQDcv2etOyDp72NaiZduLpia0RVc92MAZLyoWyq4rscfjU0MvkCPyTa6sKjF2uaUDS5R8yVHB/6+2Mzs4LuWWpNtp6b3rG88CXxfbGDIYn2BOXDqQ9s2/ceISkNMq+NbfcUbbNvG920Ot20VKjkl9s7LcEC0cLiVU14oWd8BOV6v+QKBgQDWOk8g7ktYOSD6Ib7bTiUE4RrnvTCy7OvZs8ZfEw97+UhEH8OYmW0Z5JAnUC4xsLb+KPMS2k+CVX+YhRW9Y2X9GugfyovShyWBxYno4f4uq1NQsgJNOC3EhfB6lJm1E3aNL48BoAbWEYk+/iIElW5IbQ0ahRwlJNxeGA0ouvk2wQKBgQDZYfwdEa9V8BItJHXlYSmSu/eHt27dAlbui+jEOgmJPsLzm59EeWfV7QYm4WxTu68zsHezPWJWWnVjh+PzKnsobwLzv/FCdCzwY2/jpWnmicRyTiRgQQXvZwJjTJn2jSI/4bGEfD//UA6x2wSwKB55JK/zgVWkZ5a/sdD0CaT/MQKBgA7CMHQIjXl8FqATmBgiejGV6BnbUHko4m0Ab7fQUZY1qlgKrqcXgFmMQkb+p8Og1YeVn8Qy8xuvueAfwemA8OxvLuQNzQcA2qhGZID4Tu2Ng+XIkNxMj1gJelppqVeDnZSFr3TbZcSXIVhk1idAnpGDilS8cOO6LUY/hH/IVGGe > /home/nonroot/.bacalhau/libp2p_private_key &&
       chown -R 65532:65532 /home/nonroot/'
     volumes:
       - requestervolume:/home/nonroot/
 
   requester:
-    image: "ghcr.io/bacalhau-project/bacalhau:v1.0.3"
+    image: "ghcr.io/bacalhau-project/bacalhau:v1.1.1"
     hostname: requester
     command: serve --ipfs-connect '/dns4/ipfs/tcp/5001' --node-type requester --private-internal-ipfs=false --peer none --labels "owner=labdao"
     volumes:
@@ -40,14 +40,14 @@ services:
       requester:
         condition: service_started
     healthcheck:
-      test: curl -f http://requester:1234/readyz
+      test: curl -f http://requester:1234/api/v1/healthz
       interval: 10s
       timeout: 10s
       retries: 10
       start_period: 10s
 
   compute:
-    image: "ghcr.io/bacalhau-project/bacalhau:v1.0.3"
+    image: "ghcr.io/bacalhau-project/bacalhau:v1.1.1"
     hostname: compute
     user: root
     command: serve --ipfs-connect '/dns4/ipfs/tcp/5001' --node-type compute --labels "owner=labdao" --private-internal-ipfs=false --peer "/dns4/requester/tcp/1235/p2p/Qmd2oBsjjvtUYRmb7zhDEPhSf9YbxA1a7ZLZ6hyCwMqpnh"
@@ -73,7 +73,7 @@ services:
       compute:
         condition: service_started
     healthcheck:
-      test: curl -f http://compute:1234/readyz
+      test: curl -f http://compute:1234/api/v1/healthz
       interval: 10s
       timeout: 10s
       retries: 10

docker-compose.yml

@@ -9,15 +9,16 @@ import {
   selectWalletAddress,
   selectFlowAddLoading,
   selectFlowAddKwargs,
-  selectFlowAddSuccess,
   selectFlowAddError,
   selectFlowAddName,
   setFlowAddError,
   setFlowAddKwargs,
   setFlowAddLoading,
   setFlowAddTool,
+  setFlowAddCid,
   setFlowAddSuccess,
   setFlowAddName,
+  selectFlowAddCid,
   dataFileListThunk,
   selectDataFileListError,
   selectDataFileList,
@@ -47,7 +48,7 @@ export default function AddGraph() {
   const loading = useSelector(selectFlowAddLoading)
   const error = useSelector(selectFlowAddError)
   const kwargs = useSelector(selectFlowAddKwargs)
-  const success = useSelector(selectFlowAddSuccess)
+  const cid = useSelector(selectFlowAddCid)
   const selectedTool = useSelector(selectFlowAddTool)
   const toolListError = useSelector(selectToolListError)
   const dataFileListError = useSelector(selectDataFileListError)
@@ -57,18 +58,19 @@ export default function AddGraph() {
   const [selectedToolIndex, setSelectedToolIndex] = useState('')
 
   useEffect(() => {
-    if (success) {
+    if (cid !== '') {
       dispatch(setFlowAddSuccess(false))
       dispatch(setFlowAddKwargs({}))
       dispatch(setFlowAddTool({ CID: '', WalletAddress: '', Name: '', ToolJson: { inputs: {} }}))
       dispatch(setFlowAddError(null))
       dispatch(setFlowAddName(''))
-      router.push('/flow/list')
+      dispatch(setFlowAddCid(''))
+      router.push(`/flow/detail/${cid}`)
       return
     }
     dispatch(toolListThunk())
     dispatch(dataFileListThunk())
-  }, [success, dispatch])
+  }, [cid, dispatch])
 
   const handleToolChange = (event: any) => {
     dispatch(setFlowAddTool(tools[parseInt(event.target.value)]))