fix(api): fixes code based on comments

Author: Matt-Carre

.devcontainer/devcontainer.json

@@ -53,14 +53,6 @@
         "--env-file",
         "src/.env"
     ],
-    "forwardPorts": [
-        5173
-    ],
-    "portsAttributes": {
-        "5173": {
-            "onAutoForward": "ignore"
-        }
-    },
     "mounts": [
         // Mount in the user terminal config folder so it can be edited
         {

src/copier_template/.devcontainer/devcontainer.json

@@ -53,9 +53,6 @@
         "--env-file",
         "src/.env"
     ],
-    "forwardPorts": [
-        5173
-    ],
     "mounts": [
         // Mount in the user terminal config folder so it can be edited
         {

src/copier_template/src/README.md.jinja

@@ -1,14 +1,12 @@
 # Setting up a development environment
-1. Build the dev container
-2. run "uv lock" to generate the uv.lock file
-3. Create .env in this folder (with the path src/.env) containing the following variables:
+1. run "uv lock" to generate the uv.lock file
+2. Create .env in this folder (with the path src/.env) containing the following variables:
 
-HOST=https://argo-workflows.workflows.diamond.ac.uk/ (to submit to the production repo)
-IMAGE= (usually python 3.10)
-TOKEN=
+HOST=https://argo-workflows.workflows.diamond.ac.uk/ (to submit to the production cluster)
+DEFAULT_IMAGE= (usually python 3.10)
 NAMESPACE= (the cluster you wish to run the templates on)
-AUTH=
 
+3. Build the dev container
 
 # Submitting a workflow to Argo
 1. At the start of your workflow definition file, add:

src/copier_template/src/{{ project_name }}/submit_to_argo.py.jinja

@@ -10,13 +10,14 @@ from {{project_name}}.auth.keycloak_checker import set_token_env_variable
 
 
 def submit_workflow_to_argo(w: Workflow):
-    set_token_env_variable(staging=True)
+    set_token_env_variable()
     dotenv.load_dotenv(dotenv_path="src/.env", override=True)
     w.namespace = os.environ.get("NAMESPACE")
     w.workflows_service = WorkflowsService(
         host=str(os.environ.get("HOST")).strip("'"),
         token=str(os.environ.get("TOKEN")).strip("'"),
     )
+    global_config.image = str(os.environ.get("DEFAULT_IMAGE"))
     submitted_w = cast(m.Workflow, w.create())
     name = submitted_w.metadata.name
     namespace = submitted_w.metadata.namespace

src/python_interface_to_workflows/auth/keycloak_checker.py

@@ -20,7 +20,7 @@ def set_token_env_variable(staging: bool) -> str:
             port = 5173
         case False:
             keycloak_openid = KeycloakOpenID(
-                client_id="workflows-dashboard",
+                client_id="workflows-cli",
                 server_url="https://identity.diamond.ac.uk/",
                 realm_name="dls",
                 client_secret_key="",

src/python_interface_to_workflows/submit_to_argo.py

@@ -17,7 +17,7 @@ def submit_workflow_to_argo(w: Workflow):
         host=str(os.environ.get("HOST")).strip("'"),
         token=str(os.environ.get("TOKEN")).strip("'"),
     )
-    global_config.image = str(os.environ.get("IMAGE"))
+    global_config.image = str(os.environ.get("DEFAULT_IMAGE"))
     submitted_w = cast(m.Workflow, w.create())
     name = submitted_w.metadata.name
     namespace = submitted_w.metadata.namespace