Fix/statement logs

.github/workflows/build.yaml

@@ -9,6 +9,6 @@ on:
 
 jobs:
   build-frontend:
-    uses: exacaster/lighter/.github/workflows/build-frontend.yml@master
+    uses: ./.github/workflows/build-frontend.yml
   build-java:
-    uses: exacaster/lighter/.github/workflows/build-java.yml@master
+    uses: ./.github/workflows/build-java.yml

.github/workflows/clean.yml

@@ -0,0 +1,38 @@
+name: Clean Github container registry
+on:
+  workflow_call: { }
+  pull_request:
+    types: [ closed ]
+
+jobs:
+  clean-registry:
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - spark_version: 3.3.3
+            hadoop_version: 3
+          - spark_version: 3.4.1
+            hadoop_version: 3
+          - spark_version: 3.5.0
+            hadoop_version: 3
+    steps:
+      - name: Base ref
+        run: |
+            LOWER_BRANCH=${{ github.event.pull_request.head.ref }}
+            SLUG_BRANCH=$(echo "$LOWER_BRANCH" | sed -e 's/[^a-zA-Z0-9]/-/g' -e 's/--/-/g')
+            echo "BASE_REF=$SLUG_BRANCH" >> $GITHUB_ENV
+          fi
+      - name: Delete tag on PR close or merge
+        if: github.event_name == 'pull_request' && github.event.action == 'closed'
+        env:
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          IMAGE_NAME: ${{ github.repository }}
+          BASE_REF: ${{ env.BASE_REF }}
+        run: |
+          TAG_TO_DELETE=${IMAGE_NAME}:${BASE_REF}-spark${{ matrix.spark_version }}
+          TOKEN=$(echo "${TOKEN}" | awk '{print substr($0, 12)}')
+          curl -X DELETE -H "Authorization: token ${TOKEN}" -H "Accept: application/vnd.github.v3+json" "https://ghcr.io/v2/${IMAGE_NAME}/manifests/${TAG_TO_DELETE}"

.github/workflows/publish-registry.yml

@@ -1,9 +1,15 @@
 name: Publish image to Github container registry
 on:
   workflow_call: { }
+  pull_request:
+    branches:
+      - master
 
 jobs:
   publish-registry:
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -15,10 +21,20 @@ jobs:
           - spark_version: 3.5.0
             hadoop_version: 3
     steps:
+      - name: Base ref
+        run: |
+          if [ "${{ github.event_name }}" = "release" ]; then
+            echo "BASE_REF=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
+          elif [ "${{ github.event_name }}" = "pull_request" ]; then
+            LOWER_BRANCH=${{ github.event.pull_request.head.ref }}
+            SLUG_BRANCH=$(echo "$LOWER_BRANCH" | sed -e 's/[^a-zA-Z0-9]/-/g' -e 's/--/-/g')
+            echo "$SLUG_BRANCH"
+            echo "BASE_REF=$SLUG_BRANCH" >> $GITHUB_ENV
+          fi
       - uses: docker/setup-buildx-action@v2
       - uses: docker/login-action@v2
         with:
-          registry: ghcr.io
+          registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - uses: docker/build-push-action@v3
@@ -27,4 +43,4 @@ jobs:
           build-args: |
             SPARK_VERSION=${{ matrix.spark_version }}
             HADOOP_VERSION=${{ matrix.hadoop_version }}
-          tags: ghcr.io/exacaster/lighter:${{ github.event.release.tag_name }}-spark${{ matrix.spark_version }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BASE_REF }}-spark${{ matrix.spark_version }}

.github/workflows/release.yml

@@ -6,9 +6,9 @@ on:
 
 jobs:
   build-frontend:
-    uses: exacaster/lighter/.github/workflows/build-frontend.yml@master
+    uses: ./.github/workflows/build-frontend.yml
   build-java:
-    uses: exacaster/lighter/.github/workflows/build-java.yml@master
+    uses: ./.github/workflows/build-java.yml
   publish-registry:
-    uses: exacaster/lighter/.github/workflows/publish-registry.yml@master
+    uses: ./.github/workflows/publish-registry.yml
     needs: [ build-frontend, build-java ]

server/src/main/resources/shell_wrapper.py

@@ -91,6 +91,7 @@ def __init__(self, globals) -> None:
     def _error_response(self, error):
         exc_type, exc_value, exc_tb = sys.exc_info()
         return {
+            "content": {"text/plain": str(sys.stdout.getvalue()).rstrip()},
             "error": type(error).__name__,
             "message": str(error),
             "traceback": traceback.format_exception(exc_type, exc_value, exc_tb),
@@ -144,8 +145,8 @@ def main():
     log.info("Starting session loop")
     try:
         while True:
-            setup_output()
             for command in controller.read():
+                setup_output()
                 log.debug(f"Processing command {command}")
                 result = handler.exec(command)
                 controller.write(command["id"], result)