docs(copier): updates copier template and improves example

Author: Matt-Carre

scripts/makecopiercorrect.sh

@@ -11,13 +11,15 @@ do
 
     sed -i 's/python-interface-to-workflows/{{repo_name}}/g' "$file"
     sed -i 's/DiamondLightSource/{{github_org}}/g' "$file"
+    sed -i 's/python_interface_to_workflows/{{project_name}}/g' "$file"
 
     sed -i '1i{% raw %}' "$file"
     echo '{% endraw %}' >> "$file"
 
     sed -i \
         -e 's/{{repo_name}}/{% endraw %}{{repo_name}}{% raw %}/g' \
         -e 's/{{github_org}}/{% endraw %}{{github_org}}{% raw %}/g' \
+        -e 's/{{project_name}}/{% endraw %}{{project_name}}{% raw %}/g' \
         "$file"
 
     mv "$file" "$file.jinja"
@@ -30,12 +32,14 @@ do
     sed -i 's/python-interface-to-workflows/{{repo_name}}/g' "$file"
     sed -i 's/DiamondLightSource/{{github_org}}/g' "$file"
 
+    sed -i 's/python_interface_to_workflows/{{project_name}}/g' "$file"
     sed -i '1i{% raw %}' "$file"
     echo '{% endraw %}' >> "$file"
 
     sed -i \
         -e 's/{{repo_name}}/{% endraw %}{{repo_name}}{% raw %}/g' \
         -e 's/{{github_org}}/{% endraw %}{{github_org}}{% raw %}/g' \
+        -e 's/{{project_name}}/{% endraw %}{{project_name}}{% raw %}/g' \
         "$file"
 
 
@@ -48,13 +52,14 @@ do
 
     sed -i 's/python-interface-to-workflows/{{repo_name}}/g' "$file"
     sed -i 's/DiamondLightSource/{{github_org}}/g' "$file"
-
+    sed -i 's/python_interface_to_workflows/{{project_name}}/g' "$file"
     sed -i '1i{% raw %}' "$file"
     echo '{% endraw %}' >> "$file"
 
     sed -i \
         -e 's/{{repo_name}}/{% endraw %}{{repo_name}}{% raw %}/g' \
         -e 's/{{github_org}}/{% endraw %}{{github_org}}{% raw %}/g' \
+        -e 's/{{project_name}}/{% endraw %}{{project_name}}{% raw %}/g' \
         "$file"
 
     mv "$file" "$file.jinja"

src/copier_template/src/{{ project_name }}/templates/example.txt.jinja

@@ -13,12 +13,13 @@ metadata:
     workflows.diamond.ac.uk/science-group-examples: 'true'
 spec:
   entrypoint: workflowentry
+  podSpecPatch: '{"containers": [{"name": "main", "resources": {"limits": {"cpu":
+    "1", "memory": "1Gi",}, "requests": {"cpu": "1", "memory":
+    "1Gi",}}}]}'
   templates:
   - name: workflowentry
     dag:
       tasks:
-      - name: install
-        template: install-dependencies
       - name: params
         template: generate-parameters
         arguments:
@@ -34,7 +35,7 @@ spec:
           - name: tiff
             value: 'True'
       - name: create-image
-        depends: install && params
+        depends: params
         template: create-image
         withParam: '{{tasks.params.outputs.parameters.out-parameters}}'
         arguments:
@@ -54,22 +55,6 @@ spec:
           parameters:
           - name: paths
             value: '{{tasks.create-image.outputs.parameters.out-paths}}'
-  - name: install-dependencies
-    script:
-      image: python:3.10
-      source: |-
-        import os
-        import sys
-        sys.path.append(os.getcwd())
-        import subprocess
-        print('creating venv')
-        subprocess.check_call(['python', '-m', 'venv', '/tmp/venv'])
-        subprocess.check_call(['/tmp/venv/bin/pip', 'install', 'pillow', 'h5py', 'numpy', 'hera'])
-      command:
-      - python
-      volumeMounts:
-      - name: tmpdir
-        mountPath: /tmp
   - name: generate-parameters
     inputs:
       parameters:
@@ -84,7 +69,7 @@ spec:
         valueFrom:
           path: /tmp/parameters.json
     script:
-      image: python:3.10
+      image: ghcr.io/diamondlightsource/{% endraw %}{{repo_name}}{% raw %}-image
       source: |-
         import os
         import sys
@@ -129,7 +114,7 @@ spec:
         valueFrom:
           path: /tmp/{{inputs.parameters.extension}}-path.json
     script:
-      image: python:3.10
+      image: ghcr.io/diamondlightsource/{% endraw %}{{repo_name}}{% raw %}-image
       source: |-
         import os
         import sys
@@ -163,7 +148,7 @@ spec:
         with open(f'/tmp/{extension}-path.json', 'w') as f:
             json.dump(path, f)
       command:
-      - /tmp/venv/bin/python
+      - python
       volumeMounts:
       - name: tmpdir
         mountPath: /tmp
@@ -178,7 +163,7 @@ spec:
         archive:
           none: {}
     script:
-      image: python:3.10
+      image: ghcr.io/diamondlightsource/{% endraw %}{{repo_name}}{% raw %}-image
       source: |-
         import os
         import sys
@@ -200,10 +185,22 @@ spec:
                     f.create_dataset(f'image_{i}', data=arr, dtype=arr.dtype)
         print('done')
       command:
-      - /tmp/venv/bin/python
+      - python
       volumeMounts:
       - name: tmpdir
         mountPath: /tmp
+  tolerations:
+  - effect: NoSchedule
+    key: nvidia.com/gpu
+    operator: Exists
+  - effect: NoSchedule
+    key: nodetype
+    operator: Equal
+    value: gpu
+  - effect: NoSchedule
+    key: nodegroup
+    operator: Equal
+    value: workflows
   volumeClaimTemplates:
   - metadata:
       name: tmpdir