update templates for new dockerfile

Author: DanPorter

helm-based-workflows/templates/msmapper-notebook.yaml

@@ -41,39 +41,25 @@ spec:
   templates:
     - name: mount-files
       script:
-        image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.1.0-rc3
+        image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.2.0-rc1
         command: [bash]
         source: |
           echo '{{ .Files.Get "notebooks/msmapper_notebook.ipynb" | b64enc }}' | base64 -d > /tmp/notebook.ipynb
-          echo '{{ .Files.Get "notebooks/requirements.txt" | b64enc }}' | base64 -d > /tmp/requirements.txt
-        volumeMounts:
-          - name: tmp
-            mountPath: /tmp
-    - name: download-msmapper
-      script:
-        image: docker.io/curlimages/curl
-        command: [bash]
-        source: |
-          mkdir /tmp/msmapper
-          curl https://alfred.diamond.ac.uk/MSMapper/master/builds-snapshot/MSMapper-1.9.0.v20250205-1441-linux.x86_64.zip -o /tmp/msmapper/archive.zip
-          unzip -n /tmp/msmapper/archive.zip -d /tmp/msmapper
         volumeMounts:
           - name: tmp
             mountPath: /tmp
     - name: convert-notebook
       script:
-        image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.1.0-rc3
+        image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.2.0-rc1
         command: [bash]
         source: |
-          python -m venv /tmp/venv
-          /tmp/venv/bin/pip install -r /tmp/requirements.txt
-          /tmp/venv/bin/pip install --upgrade git+https://github.com/DiamondLightSource/i16_msmapper.git
-          /tmp/venv/bin/python -m ipykernel install --prefix=/tmp/venv --name=venv
-          /tmp/venv/bin/python -m papermill /tmp/notebook.ipynb /tmp/notebook.ipynb \
+          python -m pip install --upgrade git+https://github.com/DiamondLightSource/i16_msmapper.git
+          python -m ipykernel install --prefix=/tmp/venv --name=venv
+          python -m papermill /tmp/notebook.ipynb /tmp/notebook.ipynb \
             -p datadir "{{`{{ workflow.parameters.visitdir }}`}}"
             -p inpath "{{`{{ workflow.parameters.inpath }}`}}" \
             -p outpath "{{`{{ workflow.parameters.outpath }}`}}"
-          /tmp/venv/bin/jupyter nbconvert --execute --allow-errors --to html --output notebook --output-dir /tmp /tmp/notebook.ipynb
+          jupyter nbconvert --execute --allow-errors --to html --output notebook --output-dir /tmp /tmp/notebook.ipynb
         volumeMounts:
           - name: tmp
             mountPath: /tmp
@@ -90,8 +76,6 @@ spec:
         tasks:
           - name: mount-files
             template: mount-files
-          - name: download-msmapper
-            template: download-msmapper
           - name: convert-notebook
             template: convert-notebook
-            dependencies: [mount-files, download-msmapper]
+            dependencies: [mount-files]

helm-based-workflows/templates/python_script.yaml

@@ -26,14 +26,15 @@ spec:
         value: |
           print(f"Scan command: {cmd}")
     script:
-      image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.1.0-rc3
+      image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.2.0-rc1
       volumeMounts:
         - name: session
           mountPath: "{{`{{ workflow.parameters.visitdir }}`}}"
       command: ["python"]
       source: |
         import numpy as np
         import hdfmap
+        print(hdfmap.module_info())
 
         filename = '{{`{{workflow.parameters.visitdir}}`}}/i10-1-{{`{{inputs.parameters.scan-no}}`}}.nxs'
         print(filename)

helm-based-workflows/templates/xas-notebook.yaml

@@ -41,7 +41,7 @@ spec:
   templates:
     - name: mount-files
       script:
-        image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.1.0-rc3
+        image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.2.0-rc1
         command: [bash]
         source: |
           echo '{{ .Files.Get "notebooks/xas_notebook.ipynb" | b64enc }}' | base64 -d > /tmp/notebook.ipynb
@@ -51,17 +51,15 @@ spec:
             mountPath: /tmp
     - name: convert-notebook
       script:
-        image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.1.0-rc3
+        image: ghcr.io/diamondlightsource/magnetic-materials-workflows:0.2.0-rc1
         command: [bash]
         source: |
-          python -m venv /tmp/venv
-          /tmp/venv/bin/pip install -r /tmp/requirements.txt
-          /tmp/venv/bin/pip install --upgrade git+https://github.com/DanPorter/mmg_toolbox.git
-          /tmp/venv/bin/python -m ipykernel install --prefix=/tmp/venv --name=venv
-          /tmp/venv/bin/python -m papermill /tmp/notebook.ipynb /tmp/notebook.ipynb \
+          python -m pip install --upgrade git+https://github.com/DanPorter/mmg_toolbox.git
+          python -m ipykernel install --prefix=/tmp/venv --name=venv
+          python -m papermill /tmp/notebook.ipynb /tmp/notebook.ipynb \
             -p inpath "{{`{{ workflow.parameters.inpath }}`}}" \
             -p outpath "{{`{{ workflow.parameters.outpath }}`}}"
-          /tmp/venv/bin/jupyter nbconvert --execute --allow-errors --to html --output notebook --output-dir /tmp /tmp/notebook.ipynb
+          jupyter nbconvert --execute --allow-errors --to html --output notebook --output-dir /tmp /tmp/notebook.ipynb
         volumeMounts:
           - name: tmp
             mountPath: /tmp