feat(copier): updates copier template and generator copy correctly

Author: Matt-Carre

scripts/lintyaml.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 cd src/python_interface_to_workflows/templates
-for file in *
+for file in *.yaml;
 do
 argo lint "$file" --offline
 SUCCESSFULLINT=$?

scripts/makecopiercorrect.sh

@@ -7,16 +7,36 @@ cp ../templates/*example*.txt "../../copier_template/src/{{ project_name }}/temp
 for file in "../../copier_template/src/{{ project_name }}/workflow_definitions"/*
 do
     [[ $file == *.jinja ]] && continue
+
     sed -i 's/python-interface-to-workflows/{{repo_name}}/g' "$file"
     sed -i 's/DiamondLightSource/{{github_org}}/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' \
+        "$file"
+
     mv "$file" "$file.jinja"
 done
 
 for file in "../../copier_template/src/{{ project_name }}/templates"/*
 do
     [[ $file == *.jinja ]] && continue
+
     sed -i 's/python-interface-to-workflows/{{repo_name}}/g' "$file"
     sed -i 's/DiamondLightSource/{{github_org}}/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' \
+        "$file"
+
     mv "$file" "$file.jinja"
 done
 git add "../../copier_template/src/{{ project_name }}/workflow_definitions"/*

scripts/runthefiles.sh

@@ -5,4 +5,5 @@ do
 uv run "$file"
 done
 mv *.yaml ../templates/
+mv *.txt ../templates/
 git add -u ../templates/

src/copier_template/pyproject.toml.jinja

@@ -68,7 +68,6 @@ reportMissingImports = false # Ignore missing stubs in imported modules
 reportMissingTypeStubs = "none"
 reportMissingModuleSource="warning"
 reportInvalidTypeForm="warning"
-reportMissingImports="warning"
 reportUndefinedVariable="warning"
 reportAbstractUsage="warning"
 reportArgumentType="warning"

src/copier_template/scripts/lintyaml.sh.jinja

@@ -1,6 +1,6 @@
 #!/bin/bash
 cd src/{{project_name}}/templates
-for file in *
+for file in *.yaml;
 do
 argo lint "$file" --offline
 SUCCESSFULLINT=$?

src/copier_template/scripts/runthefiles.sh.jinja

@@ -1,8 +1,9 @@
 #!/bin/bash
-cd src/{{project_name}}/workflow_definitions
+cd src/python_interface_to_workflows/workflow_definitions
 for file in *
 do
 uv run "$file"
 done
 mv *.yaml ../templates/
+mv *.txt ../templates/
 git add -u ../templates/

src/copier_template/src/{{ project_name }}/auth/keycloak_checker.py.jinja

@@ -7,26 +7,15 @@ from keycloak.pkce_utils import generate_code_challenge, generate_code_verifier
 from {{project_name}}.auth.open_auth_url import open_auth_url
 
 
-def set_token_env_variable(staging: bool) -> str:
-    match staging:
-        case True:
-            keycloak_openid = KeycloakOpenID(
-                server_url="https://identity-test.diamond.ac.uk/",
-                client_id="workflows-ui-dev",
-                realm_name="dls",
-                client_secret_key="",
-                pool_maxsize=1,
-            )
-            port = 5173
-        case False:
-            keycloak_openid = KeycloakOpenID(
-                client_id="workflows-dashboard",
+def set_token_env_variable() -> str:
+    keycloak_openid = KeycloakOpenID(
+                client_id="workflows-cli",
                 server_url="https://identity.diamond.ac.uk/",
                 realm_name="dls",
                 client_secret_key="",
                 pool_maxsize=1,
             )
-            port = 8000
+    port = 8000
     code_verifier = generate_code_verifier()
     code_challenge, code_challenge_method = generate_code_challenge(code_verifier)
     auth_url = keycloak_openid.auth_url(

src/copier_template/src/{{ project_name }}/auth/open_auth_url.py

@@ -31,8 +31,7 @@ def do_GET(self):
 
 def open_auth_url(auth_url: str, port: int) -> bool:
     dotenv.load_dotenv(dotenv_path="src/.env", override=True)
-    expiry_str: str = os.environ.get("EXPIRY")  # pyright: ignore
-    print(f"expiry_str: {expiry_str}", str(time.time()))
+    expiry_str: str = os.environ.get("EXPIRY").strip("'")  # pyright: ignore
     if (expiry_str == "" or int(expiry_str)) <= float(time.time()):
         httpd = _ReusingHTTPServer(("localhost", port), CallbackHandler)
         webbrowser.open(auth_url)
@@ -49,5 +48,4 @@ def open_auth_url(auth_url: str, port: int) -> bool:
             httpd.server_close()
         return True
     else:
-        print("using refresh token")
         return False

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

@@ -1,3 +1,4 @@
+{% raw %}
 apiVersion: argoproj.io/v1alpha1
 kind: Workflow
 metadata:
@@ -7,7 +8,7 @@ metadata:
       Replicates the functionality of
       example.yaml
     workflows.argoproj.io/title: example remade via hera
-    workflows.diamond.ac.uk/repository: https://github.com/{{github_org}}/{{repo_name}}
+    workflows.diamond.ac.uk/repository: https://github.com/{% endraw %}{{github_org}}{% raw %}/{% endraw %}{{repo_name}}{% raw %}
   labels:
     workflows.diamond.ac.uk/science-group-examples: 'true'
 spec:
@@ -212,3 +213,4 @@ spec:
       resources:
         requests:
           storage: 1Gi
+{% endraw %}

src/copier_template/src/{{ project_name }}/workflow_definitions/create_example_template.py.jinja

@@ -1,3 +1,4 @@
+{% raw %}
 from hera.workflows import (
     DAG,
     Artifact,
@@ -153,7 +154,7 @@ with Workflow(
         "workflows.argoproj.io/title": "example remade via hera",
         "workflows.argoproj.io/description": """Replicates the functionality of
 example.yaml""",
-        "workflows.diamond.ac.uk/repository": "https://github.com/{{github_org}}/{{repo_name}}",
+        "workflows.diamond.ac.uk/repository": "https://github.com/{% endraw %}{{github_org}}{% raw %}/{% endraw %}{{repo_name}}{% raw %}",
     },
     volumes=Volume(name="tmpdir", mount_path="/tmp/", size="1Gi"),
 ) as w:
@@ -178,5 +179,6 @@ example.yaml""",
         [install, params] >> makeimages >> makehdf5  # pyright: ignore
 
 
-with open("_example.yaml", "w") as div:
+with open("example.txt", "w") as div:
     div.write(w.to_yaml())  # pyright: ignore[reportUnknownMemberType]
+{% endraw %}