From 1316624438effdb9deba233953799c39443c6208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Sun, 5 Nov 2023 18:53:43 +0100
Subject: [PATCH 01/17] mf

---
 application/src/tira/data/HybridDatabase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/tira/data/HybridDatabase.py b/application/src/tira/data/HybridDatabase.py
index 2b4e3dbc..f8522bc6 100644
--- a/application/src/tira/data/HybridDatabase.py
+++ b/application/src/tira/data/HybridDatabase.py
@@ -1551,7 +1551,7 @@ def add_uploaded_run(self, task_id, vm_id, dataset_id, upload_id, uploaded_file)
         try:
             upload = modeldb.Upload.objects.get(vm__vm_id=vm_id, task__task_id=task_id, id=upload_id)
         except:
-            upload = modeldb.Upload.objects.get(vm__vm_id=vm_id, task__task_id=task_id, id=upload_id)
+            upload = modeldb.Upload.objects.get(vm__vm_id=vm_id, id=upload_id)
 
         upload.last_edit_date = now()
         upload.save()

From 6eef1412ae42c45ec6621f2392e19bf17687c23b Mon Sep 17 00:00:00 2001
From: kavlahkaff <de28oser@studserv.uni-leipzig.de>
Date: Mon, 6 Nov 2023 14:38:35 +0100
Subject: [PATCH 02/17] Made AddNewSubmission button responsive

Made edit and delete buttons on submission responsive

Made input from disabled fields copyable by changing to readonly

Added padding to submission inputs
---
 .../src/tira/frontend-vuetify/src/App.vue       |  5 +++++
 .../submission-components/DockerSubmission.vue  |  9 +++++++--
 .../ExistingDockerSubmission.vue                | 17 +++++++----------
 .../submission-components/UploadSubmission.vue  |  9 +++++++--
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/application/src/tira/frontend-vuetify/src/App.vue b/application/src/tira/frontend-vuetify/src/App.vue
index 1e6afaea..9692bcdb 100644
--- a/application/src/tira/frontend-vuetify/src/App.vue
+++ b/application/src/tira/frontend-vuetify/src/App.vue
@@ -18,6 +18,11 @@
     padding: 0px !important;
     left: auto !important;
   }
+  #app #docker-submission-readonly-input input {
+    padding: 10px 0 0 10px !important;
+    color: #BDBDBD;
+  }
+
   #app #task-search input {
     border: none !important;
     outline: none !important;
diff --git a/application/src/tira/frontend-vuetify/src/submission-components/DockerSubmission.vue b/application/src/tira/frontend-vuetify/src/submission-components/DockerSubmission.vue
index a2e0880f..7e71edd0 100644
--- a/application/src/tira/frontend-vuetify/src/submission-components/DockerSubmission.vue
+++ b/application/src/tira/frontend-vuetify/src/submission-components/DockerSubmission.vue
@@ -2,15 +2,20 @@
   <loading :loading="loading"/>
   <login-to-submit v-if="!loading && role === 'guest'"/>
   <v-row v-if="!loading && role !== 'guest'">
-    <v-col :cols="$vuetify.display.mdAndUp ? '9' : '11'">
+    <v-col :cols="$vuetify.display.mdAndUp ? '9' : '12'">
       <v-autocomplete clearable auto-select-first label="Choose software &hellip;" prepend-inner-icon="mdi-magnify" :items="allSoftwareSubmissions" item-title="display_name" item-value="docker_software_id"
                     variant="underlined" v-model="tab"/>
       </v-col>
-      <v-col :cols="$vuetify.display.mdAndUp ? '3' : '1'">
+      <v-col v-if="!$vuetify.display.smAndDown" :cols="$vuetify.display.mdAndUp ? '3' : '0'">
         <v-btn color="primary" v-if="!$vuetify.display.mdAndUp" icon="mdi-plus" @click="this.tab = 'newDockerImage'"/>
         <v-btn color="primary" v-if="$vuetify.display.mdAndUp" prepend-icon="mdi-plus" size="large" @click="this.tab = 'newDockerImage'" block>New Submission</v-btn>
       </v-col>
   </v-row>
+  <v-row v-if="$vuetify.display.smAndDown">
+    <v-col :cols="12">
+        <v-btn color="primary" prepend-icon="mdi-plus" size="large" @click="this.tab = 'newDockerImage'" block rounded>New Submission</v-btn>
+    </v-col>
+  </v-row>
   <v-row v-if="!loading && role !== 'guest'">
     <v-col cols="10">
       <v-tabs v-model="tab" fixed-tabs class="mb-10 d-none">
diff --git a/application/src/tira/frontend-vuetify/src/submission-components/ExistingDockerSubmission.vue b/application/src/tira/frontend-vuetify/src/submission-components/ExistingDockerSubmission.vue
index 64999908..cde6f37b 100644
--- a/application/src/tira/frontend-vuetify/src/submission-components/ExistingDockerSubmission.vue
+++ b/application/src/tira/frontend-vuetify/src/submission-components/ExistingDockerSubmission.vue
@@ -2,9 +2,7 @@
   <loading :loading="loading"/>
   <v-container v-if="!loading">
     <v-card class="px-5">
-      <div class="w-100 d-flex justify-space-between">
-        <v-card-title></v-card-title>
-        <div class="mt-4">
+      <div :class="$vuetify.display.mdAndUp ? 'w-100 d-flex justify-end mt-4' : 'w-100 d-flex justify-space-evenly mt-4'">
           <edit-submission-details
               type='docker'
               :id="docker_software_id"
@@ -21,14 +19,13 @@
             <v-icon>mdi-delete-alert-outline</v-icon>
             Delete
           </v-btn>
-        </div>
       </div>
 
-      <v-card-subtitle>{{ docker_software_details.description }}</v-card-subtitle>
-      <v-form>
-        <v-text-field label="Previous Stages (Disabled for Reproducibility)" v-if="docker_software_details.previous_stages" v-model="docker_software_details.previous_stages" disabled/>
-        <v-text-field label="Docker Image (Disabled for Reproducibility)" v-model="docker_software_details.user_image_name" disabled/>
-        <v-text-field label="Command (Disabled for Reproducibility)" v-model="docker_software_details.command" disabled/>
+      <v-card-subtitle class="my-4">{{ docker_software_details.description }}</v-card-subtitle>
+      <v-form id="docker-submission-readonly-input">
+        <v-text-field label="Previous Stages (Immutable for Reproducibility)" v-if="docker_software_details.previous_stages" v-model="docker_software_details.previous_stages" readonly/>
+        <v-text-field label="Docker Image (Immutable for Reproducibility)" v-model="docker_software_details.user_image_name" readonly/>
+        <v-text-field label="Command (Immutable for Reproducibility)" v-model="docker_software_details.command" readonly/>
       </v-form>
 
       <v-divider></v-divider>
@@ -127,4 +124,4 @@ export default {
     }
   }
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/application/src/tira/frontend-vuetify/src/submission-components/UploadSubmission.vue b/application/src/tira/frontend-vuetify/src/submission-components/UploadSubmission.vue
index c743e21c..f73e4f6c 100644
--- a/application/src/tira/frontend-vuetify/src/submission-components/UploadSubmission.vue
+++ b/application/src/tira/frontend-vuetify/src/submission-components/UploadSubmission.vue
@@ -2,15 +2,20 @@
   <loading :loading="loading"/>
   <login-to-submit v-if="!loading && role === 'guest'"/>
   <v-row v-if="!loading && role !== 'guest'">
-    <v-col :cols="$vuetify.display.mdAndUp ? '9' : '11'">
+    <v-col :cols="$vuetify.display.mdAndUp ? '9' : '12'">
       <v-autocomplete clearable auto-select-first label="Choose upload &hellip;" prepend-inner-icon="mdi-magnify" :items="this.uploadGroups" item-title="display_name" item-value="id"
                     variant="underlined" v-model="tab"/>
     </v-col>
-    <v-col :cols="$vuetify.display.mdAndUp ? '3' : '1'">
+    <v-col v-if="!$vuetify.display.smAndDown" :cols="$vuetify.display.mdAndUp ? '3' : '0'">
       <v-btn color="primary" v-if="!$vuetify.display.mdAndUp" icon="mdi-plus" @click="this.tab = 'newUploadGroup'"/>
         <v-btn color="primary" v-if="$vuetify.display.mdAndUp" prepend-icon="mdi-plus" size="large" @click="this.tab = 'newUploadGroup'" block>New Uploadgroup</v-btn>
     </v-col>
   </v-row>
+  <v-row v-if="$vuetify.display.smAndDown">
+    <v-col :cols="12">
+        <v-btn color="primary" prepend-icon="mdi-plus" size="large" @click="this.tab = 'newUploadGroup'" block rounded>New Uploadgroup</v-btn>
+    </v-col>
+  </v-row>
   <v-row v-if="!loading && role !== 'guest'">
     <v-col cols="10">
       <v-tabs v-model="tab" fixed-tabs class="mb-10 d-none">

From 61400acbb931bf9c5f33830b944f112e80f12be2 Mon Sep 17 00:00:00 2001
From: kavlahkaff <de28oser@studserv.uni-leipzig.de>
Date: Mon, 6 Nov 2023 17:03:17 +0100
Subject: [PATCH 03/17] made overflow-y hidden in App.vue

---
 application/src/tira/frontend-vuetify/src/App.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/src/tira/frontend-vuetify/src/App.vue b/application/src/tira/frontend-vuetify/src/App.vue
index 1e6afaea..d88710d2 100644
--- a/application/src/tira/frontend-vuetify/src/App.vue
+++ b/application/src/tira/frontend-vuetify/src/App.vue
@@ -8,6 +8,9 @@
 </template>
 
 <style>
+  #app main{
+    overflow-y: hidden;
+  }
   #app input {
     margin: 0px !important;
     padding: 0px !important;

From b81797b28bddb0485cfab5cf163aecdfdd88d065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 07:12:53 +0100
Subject: [PATCH 04/17] Allow to select previous stages from the set of already
 published stages.

---
 application/Makefile                                |  4 ++--
 application/src/tira/data/HybridDatabase.py         | 13 +++++++++++++
 .../submission-components/NewDockerSubmission.vue   |  7 ++++---
 application/src/tira/tira_model.py                  |  2 ++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/application/Makefile b/application/Makefile
index b068a996..2e652610 100644
--- a/application/Makefile
+++ b/application/Makefile
@@ -2,8 +2,8 @@
 
 VENV_NAME?=venv
 PYTHON=${PWD}/${VENV_NAME}/bin/python3
-VERSION_APPLICATION=0.0.89
-VERSION_GRPC=0.0.89
+VERSION_APPLICATION=0.0.90
+VERSION_GRPC=0.0.90
 
 .DEFAULT: help
 help:
diff --git a/application/src/tira/data/HybridDatabase.py b/application/src/tira/data/HybridDatabase.py
index f8522bc6..8e05585b 100644
--- a/application/src/tira/data/HybridDatabase.py
+++ b/application/src/tira/data/HybridDatabase.py
@@ -765,6 +765,19 @@ def get_docker_softwares(task_id, vm_id, return_only_names=True):
         else:
             return ret
 
+    @staticmethod
+    def get_public_docker_softwares(task_id, return_only_names=True):
+        ret = modeldb.DockerSoftware.objects.filter(task__task_id=task_id, deleted=False,
+                                                    public_image_name__isnull=False)
+
+        ret = [i for i in ret if i.public_image_name and i.public_image_size]
+
+        if return_only_names:
+            return [{'docker_software_id': i.docker_software_id, 'display_name': i.display_name, 'vm_id': i.vm_id}
+                    for i in ret]
+        else:
+            return ret
+
     def delete_docker_software(self, task_id, vm_id, docker_software_id):
         software_qs = modeldb.DockerSoftware.objects.filter(vm_id=vm_id, task_id=task_id,
                                                             docker_software_id=docker_software_id)
diff --git a/application/src/tira/frontend-vuetify/src/submission-components/NewDockerSubmission.vue b/application/src/tira/frontend-vuetify/src/submission-components/NewDockerSubmission.vue
index 14f6b5c2..8bbcd315 100644
--- a/application/src/tira/frontend-vuetify/src/submission-components/NewDockerSubmission.vue
+++ b/application/src/tira/frontend-vuetify/src/submission-components/NewDockerSubmission.vue
@@ -207,6 +207,7 @@ export default {
       step: this.step_prop,
       all_uploadgroups: [{"id": null, "display_name": 'loading...'}],
       docker_images: [{ "image": "loading...", "architecture": "loading...", "created": "loading...", "size": "loading...", "digest": "loading...", 'title': 'loading...'}],
+      public_docker_softwares: [{"docker_software_id": 'loading...', "display_name": 'loading...', 'vm_id': 'loading...'}],
       user_id_for_task: extractUserFromCurrentUrl(),
     }
   },
@@ -222,7 +223,9 @@ export default {
       }
     },
     all_previous_stages() {
-      return this.docker_softwares.concat(this.all_uploadgroups.map((i) => ({"display_name": i.display_name, "docker_software_id": ('upload-' + i.id)})))
+      return this.docker_softwares
+        .concat(this.all_uploadgroups.map((i) => ({"display_name": i.display_name, "docker_software_id": ('upload-' + i.id)})))
+        .concat(this.public_docker_softwares.filter((i) => i.vm_id !== this.user_id_for_task).map((i) => ({"display_name": i.vm_id + '/' + i.display_name, "docker_software_id": i.docker_software_id})))
     },
     double_check_tira_run_command() {
       return this.tira_final_run_example.replace('YOUR-IMAGE', this.selectedDockerImage).replace('YOUR-COMMAND', this.runCommand)
@@ -282,8 +285,6 @@ export default {
           .then(this.refreshTitles)
           .catch(reportError("Problem While Loading the Docker Images.", "This might be a short-term hiccup, please try again. We got the following error: "))
       })
-    
-
   },
   watch: {
     step(old_value, new_value) {
diff --git a/application/src/tira/tira_model.py b/application/src/tira/tira_model.py
index ce435e20..b6f1684e 100644
--- a/application/src/tira/tira_model.py
+++ b/application/src/tira/tira_model.py
@@ -148,6 +148,7 @@ def load_docker_data(task_id, vm_id, cache, force_cache_refresh):
     docker_images = [i for i in git_runner.docker_images_in_user_repository(vm_id, cache, force_cache_refresh) if '-tira-docker-software-id-' not in i['image']]
     last_refresh = load_refresh_timestamp_for_cache_key(cache, 'docker-images-in-user-repository-tira-user-' + vm_id)
     docker_software_help = git_runner.help_on_uploading_docker_image(vm_id, cache, force_cache_refresh)
+    public_docker_softwares = model.get_public_docker_softwares(task_id)
 
     docker_login = 'docker login' + docker_software_help.split('<code>docker login')[1].split('</code>')[0]
 
@@ -156,6 +157,7 @@ def load_docker_data(task_id, vm_id, cache, force_cache_refresh):
         "resources": list(settings.GIT_CI_AVAILABLE_RESOURCES.values()),
         "docker_software_help": docker_software_help,
         "docker_images_last_refresh": str(last_refresh),
+        "public_docker_softwares": public_docker_softwares,
         "task_is_an_information_retrieval_task": True if get_task(task_id, False).get('is_ir_task', False) else False,
         "docker_images_next_refresh": str(None if last_refresh is None else (last_refresh + datetime.timedelta(seconds=60))),
         "tira_initial_run_example": '# This example shows how to execute the baseline on a small example dataset.\n' +

From 02eee1bb146df45f048310d7a23e27d36c0d26cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 12:45:35 +0100
Subject: [PATCH 05/17] Add method to get public submissions

---
 application/src/tira/endpoints/data_api.py            |  6 ++++++
 .../submission-components/EditSubmissionDetails.vue   |  2 +-
 application/src/tira/tira_model.py                    |  4 ++--
 application/src/tira/urls.py                          |  1 +
 application/test/api_access_matrix.py                 | 11 +++++++++++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/application/src/tira/endpoints/data_api.py b/application/src/tira/endpoints/data_api.py
index bc271547..c7efdb5f 100644
--- a/application/src/tira/endpoints/data_api.py
+++ b/application/src/tira/endpoints/data_api.py
@@ -363,6 +363,12 @@ def get_running_software(request, context, task_id, user_id, force_cache_refresh
     return JsonResponse({'status': 0, "context": context})
 
 
+@add_context
+def public_submissions(request, context, task_id):
+    context['public_submissions'] = model.model.get_public_docker_softwares(task_id)
+
+    return JsonResponse({'status': 0, "context": context})
+
 @check_permissions
 @check_resources_exist("json")
 @add_context
diff --git a/application/src/tira/frontend-vuetify/src/submission-components/EditSubmissionDetails.vue b/application/src/tira/frontend-vuetify/src/submission-components/EditSubmissionDetails.vue
index c7024c52..c00debe7 100644
--- a/application/src/tira/frontend-vuetify/src/submission-components/EditSubmissionDetails.vue
+++ b/application/src/tira/frontend-vuetify/src/submission-components/EditSubmissionDetails.vue
@@ -13,7 +13,7 @@
           <v-textarea v-model="description" label="Description"/>
           <v-text-field v-model="paper_link" label="Link your Paper"/>
           <v-checkbox v-model="ir_re_ranker" label="Is this software an re-ranker?" v-if="is_ir_task && type == 'docker'"/>
-          <v-checkbox v-model="ir_re_ranking_input" label="Is the output of this component a rin file to be re-ranked by others?" v-if="is_ir_task"/>
+          <v-checkbox v-model="ir_re_ranking_input" label="Is the output of this component a run file to be re-ranked by others?" v-if="is_ir_task"/>
         </v-form>
       </v-card-text>
 
diff --git a/application/src/tira/tira_model.py b/application/src/tira/tira_model.py
index b6f1684e..693a0e90 100644
--- a/application/src/tira/tira_model.py
+++ b/application/src/tira/tira_model.py
@@ -250,7 +250,7 @@ def get_ordered_input_runs_of_software(docker_software, task_id, dataset_id, vm_
         if not input_run or not input_run.get('dataset_id', None) or not input_run.get('run_id', None):
             missing_input_runs += [__formatted_error_message_for_missing_input_run(docker_software, input_run)]
         else:
-            input_run['vm_id'] = vm_id
+            input_run['vm_id'] = model.get_run(run_id=input_run['run_id'], vm_id=None, dataset_id=None)['vm']
             input_runs += [input_run]
 
     for (dsid, uid) in model.get_ordered_additional_input_runs_of_software(docker_software):
@@ -259,7 +259,7 @@ def get_ordered_input_runs_of_software(docker_software, task_id, dataset_id, vm_
         if not input_run or not input_run.get('dataset_id', None) or not input_run.get('run_id', None):
             missing_input_runs += [__formatted_error_message_for_missing_input_run(docker_software, input_run)]
         else:
-            input_run['vm_id'] = vm_id
+            input_run['vm_id'] = model.get_run(run_id=input_run['run_id'], vm_id=None, dataset_id=None)['vm']
             input_runs += [input_run]
 
     if not input_runs or len(input_runs) < 1:
diff --git a/application/src/tira/urls.py b/application/src/tira/urls.py
index cda8def1..788ffc29 100644
--- a/application/src/tira/urls.py
+++ b/application/src/tira/urls.py
@@ -108,6 +108,7 @@
     path('api/task/<str:task_id>/user/<str:user_id>/refresh-docker-images', data_api.update_docker_images, name="get_updated_docker_images"),
     path('api/count-of-missing-reviews/<str:task_id>', organizer_api.get_count_of_missing_reviews, name='get_count_of_missing_reviews'),
     path('api/task/<str:task_id>/user/<str:user_id>/software/running/<str:force_cache_refresh>', data_api.get_running_software, name='get_running_software'),
+    path('api/task/<str:task_id>/public-submissions', data_api.public_submissions, name='public_submissions'),
     path('api/review/<str:dataset_id>/<str:vm_id>/<str:run_id>', data_api.get_review, name='get_review'),
     path('api/registration/add_registration/<str:vm_id>/<str:task_id>', data_api.add_registration, name='add_registration'),
     path('api/submissions-for-task/<str:task_id>/<str:user_id>/<str:submission_type>', data_api.submissions_for_task, name="submissions_for_task"),
diff --git a/application/test/api_access_matrix.py b/application/test/api_access_matrix.py
index 203c7d50..23c69453 100644
--- a/application/test/api_access_matrix.py
+++ b/application/test/api_access_matrix.py
@@ -144,6 +144,17 @@
             ORGANIZER_WRONG_TASK: 200,
         },
     ),
+    route_to_test(
+        url_pattern='api/task/<str:task_id>/public-submissions',
+        params={'task_id': '1'},
+        group_to_expected_status_code={
+            ADMIN: 200,
+            GUEST: 200,
+            PARTICIPANT: 200,
+            ORGANIZER: 200,
+            ORGANIZER_WRONG_TASK: 200,
+        },
+    ),
     route_to_test(
         url_pattern='api/submissions-of-user/<str:vm_id>',
         params={'vm_id': 'does-not-exist'},

From 9736df0b81d7a0bc52a3e3105e2a3b0040d20d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 12:48:27 +0100
Subject: [PATCH 06/17] Add method to get public submissions

---
 python-client/Makefile                |  2 +-
 python-client/README.md               | 11 +++++++++++
 python-client/tira/__init__.py        |  2 +-
 python-client/tira/rest_api_client.py |  6 ++++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/python-client/Makefile b/python-client/Makefile
index 989a4987..694142e6 100644
--- a/python-client/Makefile
+++ b/python-client/Makefile
@@ -1,7 +1,7 @@
 build-pypi-package: run-tests
 	python3 -m build --sdist .
 	python3 -m build --wheel .
-	twine upload dist/tira-0.0.69-py3-none-any.whl dist/tira-0.0.69.tar.gz
+	twine upload dist/tira-0.0.70-py3-none-any.whl dist/tira-0.0.70.tar.gz
 
 run-tests:
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/app -w /app --entrypoint pytest webis/tira:python-client-dev-0.0.2
diff --git a/python-client/README.md b/python-client/README.md
index 59413358..1b69cea6 100644
--- a/python-client/README.md
+++ b/python-client/README.md
@@ -34,6 +34,17 @@ for dataset in TIREX_DATASETS:
     output = tira.get_run_output('ir-benchmarks/tira-ir-starter/BM25 Re-Rank (tira-ir-starter-pyterrier)', dataset)
 ```
 
+## Overview of public submissions
+
+As an example, you can see all public software submissions submitted to [TIREx](https://www.tira.io/tirex) via:
+
+```
+from tira.rest_api_client import Client
+
+tira = Client()
+submissions = tira.all_softwares("ir-benchmarks")
+```
+
 ## Export datasets
 
 You can export datasets if you are the owner or if the dataset is public.
diff --git a/python-client/tira/__init__.py b/python-client/tira/__init__.py
index 91d25566..43477230 100644
--- a/python-client/tira/__init__.py
+++ b/python-client/tira/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.0.69"
+__version__ = "0.0.70"
 
diff --git a/python-client/tira/rest_api_client.py b/python-client/tira/rest_api_client.py
index 56fd355e..ec148d02 100644
--- a/python-client/tira/rest_api_client.py
+++ b/python-client/tira/rest_api_client.py
@@ -49,6 +49,12 @@ def datasets(self, task):
     def docker_software_id(self, approach):
         return self.docker_software(approach)['docker_software_id']
 
+    def all_softwares(self, task_id):
+        """
+        Return all public submissions.
+        """
+        return [task_id + '/' + i['vm_id'] + '/' + i['display_name'] for i in self.json_response(f'/api/task/{task_id}/public-submissions')['context']['public_submissions']]
+
     def docker_software(self, approach):
         task, team, software = approach.split('/')
         docker_softwares = self.metadata_for_task(task, team)['context']['docker']['docker_softwares']

From e42a0206d5d63589e97bb78511c2a3b249615f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 14:36:57 +0100
Subject: [PATCH 07/17] Add rest method to display details of a submission.

---
 application/src/tira/data/HybridDatabase.py |  8 +++++---
 application/src/tira/endpoints/data_api.py  | 11 +++++++++++
 application/src/tira/urls.py                |  1 +
 application/test/api_access_matrix.py       | 11 +++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/application/src/tira/data/HybridDatabase.py b/application/src/tira/data/HybridDatabase.py
index 8e05585b..bcdbb0b0 100644
--- a/application/src/tira/data/HybridDatabase.py
+++ b/application/src/tira/data/HybridDatabase.py
@@ -765,16 +765,18 @@ def get_docker_softwares(task_id, vm_id, return_only_names=True):
         else:
             return ret
 
-    @staticmethod
-    def get_public_docker_softwares(task_id, return_only_names=True):
+    def get_public_docker_softwares(self, task_id, return_only_names=True, return_details=True):
         ret = modeldb.DockerSoftware.objects.filter(task__task_id=task_id, deleted=False,
                                                     public_image_name__isnull=False)
 
         ret = [i for i in ret if i.public_image_name and i.public_image_size]
 
         if return_only_names:
-            return [{'docker_software_id': i.docker_software_id, 'display_name': i.display_name, 'vm_id': i.vm_id}
+            return [{'docker_software_id': i.docker_software_id, 'display_name': i.display_name, 'vm_id': i.vm_id
+                     }
                     for i in ret]
+        elif return_details:
+            return [self._docker_software_to_dict(i) for i in ret]
         else:
             return ret
 
diff --git a/application/src/tira/endpoints/data_api.py b/application/src/tira/endpoints/data_api.py
index c7efdb5f..7d3b6f10 100644
--- a/application/src/tira/endpoints/data_api.py
+++ b/application/src/tira/endpoints/data_api.py
@@ -369,6 +369,17 @@ def public_submissions(request, context, task_id):
 
     return JsonResponse({'status': 0, "context": context})
 
+
+@add_context
+def public_submission(request, context, task_id, user_id, display_name):
+    for i in model.model.get_public_docker_softwares(task_id, return_only_names=False, return_details=True):
+        if i['display_name'] == display_name and i['vm_id'] == user_id:
+            context['submission'] = i
+            return JsonResponse({'status': 0, "context": context})
+
+    return JsonResponse({'status': 1, "messge": "Software '{task_id}/{user_id}/{display_name}' does not exist."})
+
+
 @check_permissions
 @check_resources_exist("json")
 @add_context
diff --git a/application/src/tira/urls.py b/application/src/tira/urls.py
index 788ffc29..f5332e59 100644
--- a/application/src/tira/urls.py
+++ b/application/src/tira/urls.py
@@ -109,6 +109,7 @@
     path('api/count-of-missing-reviews/<str:task_id>', organizer_api.get_count_of_missing_reviews, name='get_count_of_missing_reviews'),
     path('api/task/<str:task_id>/user/<str:user_id>/software/running/<str:force_cache_refresh>', data_api.get_running_software, name='get_running_software'),
     path('api/task/<str:task_id>/public-submissions', data_api.public_submissions, name='public_submissions'),
+    path('api/task/<str:task_id>/submission-details/<str:user_id>/<str:display_name>', data_api.public_submission, name='public_submission'),
     path('api/review/<str:dataset_id>/<str:vm_id>/<str:run_id>', data_api.get_review, name='get_review'),
     path('api/registration/add_registration/<str:vm_id>/<str:task_id>', data_api.add_registration, name='add_registration'),
     path('api/submissions-for-task/<str:task_id>/<str:user_id>/<str:submission_type>', data_api.submissions_for_task, name="submissions_for_task"),
diff --git a/application/test/api_access_matrix.py b/application/test/api_access_matrix.py
index 23c69453..c739df28 100644
--- a/application/test/api_access_matrix.py
+++ b/application/test/api_access_matrix.py
@@ -155,6 +155,17 @@
             ORGANIZER_WRONG_TASK: 200,
         },
     ),
+    route_to_test(
+        url_pattern='api/task/<str:task_id>/submission-details/<str:user_id>/<str:display_name>',
+        params={'task_id': '1', 'user_id': '2', 'display_name': '3'},
+        group_to_expected_status_code={
+            ADMIN: 200,
+            GUEST: 200,
+            PARTICIPANT: 200,
+            ORGANIZER: 200,
+            ORGANIZER_WRONG_TASK: 200,
+        },
+    ),
     route_to_test(
         url_pattern='api/submissions-of-user/<str:vm_id>',
         params={'vm_id': 'does-not-exist'},

From a00de5abdc0ea6e8738080f323abb6c1accd2da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 14:55:15 +0100
Subject: [PATCH 08/17] Add rest endpoint to load details of published
 submissions

---
 python-client/Makefile                | 2 +-
 python-client/tira/__init__.py        | 2 +-
 python-client/tira/rest_api_client.py | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/python-client/Makefile b/python-client/Makefile
index 694142e6..ff3ac7f0 100644
--- a/python-client/Makefile
+++ b/python-client/Makefile
@@ -1,7 +1,7 @@
 build-pypi-package: run-tests
 	python3 -m build --sdist .
 	python3 -m build --wheel .
-	twine upload dist/tira-0.0.70-py3-none-any.whl dist/tira-0.0.70.tar.gz
+	twine upload dist/tira-0.0.71-py3-none-any.whl dist/tira-0.0.71.tar.gz
 
 run-tests:
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/app -w /app --entrypoint pytest webis/tira:python-client-dev-0.0.2
diff --git a/python-client/tira/__init__.py b/python-client/tira/__init__.py
index 43477230..17545e06 100644
--- a/python-client/tira/__init__.py
+++ b/python-client/tira/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.0.70"
+__version__ = "0.0.71"
 
diff --git a/python-client/tira/rest_api_client.py b/python-client/tira/rest_api_client.py
index ec148d02..9f72bc64 100644
--- a/python-client/tira/rest_api_client.py
+++ b/python-client/tira/rest_api_client.py
@@ -57,11 +57,7 @@ def all_softwares(self, task_id):
 
     def docker_software(self, approach):
         task, team, software = approach.split('/')
-        docker_softwares = self.metadata_for_task(task, team)['context']['docker']['docker_softwares']
-
-        for i in docker_softwares:
-            if i['display_name'] == software:
-                return i
+        return self.json_response(f'/api/task/{task}/submission-details/{team}/{software}')['context']['submission']
 
     def docker_software_details(self, approach):
         task, team, software = approach.split('/')

From 20dd896744c4dd4bf5f33382782d8f2850d491a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 15:09:16 +0100
Subject: [PATCH 09/17] add

---
 python-client/tests/ir_datasets_test.py | 16 ++++++++--------
 python-client/tests/rest_api_test.py    | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 python-client/tests/rest_api_test.py

diff --git a/python-client/tests/ir_datasets_test.py b/python-client/tests/ir_datasets_test.py
index 0f21ea7b..8b10f5c7 100644
--- a/python-client/tests/ir_datasets_test.py
+++ b/python-client/tests/ir_datasets_test.py
@@ -45,9 +45,9 @@ def test_loading_raw_ir_datasets():
     
 
 def test_loading_queries_from_ir_datasets_from_custom_directory():
-    os.environ['TIRA_INPUT_DIRECTORY'] = 'tests/resources/sample-input-full-rank'
+    os.environ['TIRA_INPUT_DATASET'] = 'tests/resources/sample-input-full-rank'
     ir_datasets = load_ir_datasets()
-    del os.environ['TIRA_INPUT_DIRECTORY']
+    del os.environ['TIRA_INPUT_DATASET']
     dataset = ir_datasets.load('does-not-exist-and-is-not-used')
     queries = {i.query_id: i.text for i in dataset.queries_iter()}
 
@@ -55,9 +55,9 @@ def test_loading_queries_from_ir_datasets_from_custom_directory():
     assert queries['1'] == 'fox jumps above animal'
 
 def test_loading_documents_from_ir_datasets_from_custom_directory():
-    os.environ['TIRA_INPUT_DIRECTORY'] = 'tests/resources/sample-input-full-rank'
+    os.environ['TIRA_INPUT_DATASET'] = 'tests/resources/sample-input-full-rank'
     ir_datasets = load_ir_datasets()
-    del os.environ['TIRA_INPUT_DIRECTORY']
+    del os.environ['TIRA_INPUT_DATASET']
     dataset = ir_datasets.load('does-not-exist-and-is-not-used')
     docs = {i.doc_id: i.text for i in dataset.docs_iter()}
 
@@ -66,9 +66,9 @@ def test_loading_documents_from_ir_datasets_from_custom_directory():
 
 
 def test_loading_docs_store_from_ir_datasets_from_custom_directory():
-    os.environ['TIRA_INPUT_DIRECTORY'] = 'tests/resources/sample-input-full-rank'
+    os.environ['TIRA_INPUT_DATASET'] = 'tests/resources/sample-input-full-rank'
     ir_datasets = load_ir_datasets()
-    del os.environ['TIRA_INPUT_DIRECTORY']
+    del os.environ['TIRA_INPUT_DATASET']
     dataset = ir_datasets.load('does-not-exist-and-is-not-used')
 
     assert dataset.docs_store()['pangram-03'].text == 'The jay, pig, fox, zebra and my wolves quack!'
@@ -83,14 +83,14 @@ def test_no_patching_for_pyterrier_datasets():
     assert queries['269'] == 'has a criterion been established for determining the axial compressor choking line'
 
 def test_patching_for_pyterrier_datasets():
-    os.environ['TIRA_INPUT_DIRECTORY'] = 'tests/resources/sample-input-full-rank'
+    os.environ['TIRA_INPUT_DATASET'] = 'tests/resources/sample-input-full-rank'
     import ir_datasets
     l = ir_datasets.load
     ensure_pyterrier_is_loaded()
     import pyterrier as pt
     dataset = pt.get_dataset('irds:does-not-exist-and-is-not-used')
     ir_datasets.load = l
-    del os.environ['TIRA_INPUT_DIRECTORY']
+    del os.environ['TIRA_INPUT_DATASET']
 
     queries = {i['qid']: i['query'] for _, i in dataset.get_topics().iterrows()}
 
diff --git a/python-client/tests/rest_api_test.py b/python-client/tests/rest_api_test.py
new file mode 100644
index 00000000..9aaa7546
--- /dev/null
+++ b/python-client/tests/rest_api_test.py
@@ -0,0 +1,16 @@
+from tira.rest_api_client import Client
+tira = Client()
+
+
+def test_all_softwares_works_for_tirex():
+    actual = tira.all_softwares("ir-benchmarks")
+    
+    assert 'ir-benchmarks/tira-ir-starter/ChatNoir' in actual
+    assert 'ir-benchmarks/tira-ir-starter/Index (tira-ir-starter-pyterrier)' in actual
+
+def test_details_of_public_software_01():
+    actual = tira.docker_software( 'ir-benchmarks/tira-ir-starter/TF_IDF (tira-ir-starter-pyterrier)')
+
+    assert actual is not None
+    assert actual['ir_re_ranker'] == False
+

From c199746cc6ef3a19ea96d0a915aaac8a731bc370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 16:16:31 +0100
Subject: [PATCH 10/17] Add more tests

---
 python-client/Makefile                         |  2 +-
 python-client/tests/rest_api_test.py           |  6 ++++++
 python-client/tira/__init__.py                 |  2 +-
 python-client/tira/third_party_integrations.py | 14 +++++++-------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/python-client/Makefile b/python-client/Makefile
index ff3ac7f0..9eb9b60a 100644
--- a/python-client/Makefile
+++ b/python-client/Makefile
@@ -1,7 +1,7 @@
 build-pypi-package: run-tests
 	python3 -m build --sdist .
 	python3 -m build --wheel .
-	twine upload dist/tira-0.0.71-py3-none-any.whl dist/tira-0.0.71.tar.gz
+	twine upload dist/tira-0.0.72-py3-none-any.whl dist/tira-0.0.72.tar.gz
 
 run-tests:
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/app -w /app --entrypoint pytest webis/tira:python-client-dev-0.0.2
diff --git a/python-client/tests/rest_api_test.py b/python-client/tests/rest_api_test.py
index 9aaa7546..056a8376 100644
--- a/python-client/tests/rest_api_test.py
+++ b/python-client/tests/rest_api_test.py
@@ -14,3 +14,9 @@ def test_details_of_public_software_01():
     assert actual is not None
     assert actual['ir_re_ranker'] == False
 
+def test_output_of_run():
+    actual = tira.get_run_output('ir-benchmarks/tira-ir-starter/BM25 Re-Rank (tira-ir-starter-pyterrier)', 'antique-test-20230107-training')
+    actual = open(actual + '/run.txt', 'r').read()
+    
+    assert actual.startswith('8293 Q0 8293_1 1 33.568841093129976 pyterrier.default_pipelines.wmodel_text_scorer')
+
diff --git a/python-client/tira/__init__.py b/python-client/tira/__init__.py
index 17545e06..3e786c46 100644
--- a/python-client/tira/__init__.py
+++ b/python-client/tira/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.0.71"
+__version__ = "0.0.72"
 
diff --git a/python-client/tira/third_party_integrations.py b/python-client/tira/third_party_integrations.py
index 1e3f72a3..38f1b81a 100644
--- a/python-client/tira/third_party_integrations.py
+++ b/python-client/tira/third_party_integrations.py
@@ -7,7 +7,7 @@ def ensure_pyterrier_is_loaded(boot_packages=("com.github.terrierteam:terrier-pr
     import pyterrier as pt
 
     # Detect if we are in the TIRA sandbox
-    if patch_ir_datasets and 'TIRA_INPUT_DIRECTORY' in os.environ:
+    if patch_ir_datasets and 'TIRA_INPUT_DATASET' in os.environ:
         try:
             import ir_datasets as original_ir_datasets
             original_ir_datasets.load = load_ir_datasets().load
@@ -44,14 +44,14 @@ def get_preconfigured_chatnoir_client(config_directory, features=['TARGET_URI'],
 
 
 def get_output_directory(default_output: str = '/tmp/'):
-    output_directory = os.environ.get('TIRA_OUTPUT_DIRECTORY', default_output)
+    output_directory = os.environ.get('TIRA_OUTPUT_DIR', default_output)
     print(f'The output directory is {output_directory}')
     
     return output_directory
 
 
 def get_input_directory_and_output_directory(default_input, default_output: str = '/tmp/'):
-    input_directory = os.environ.get('TIRA_INPUT_DIRECTORY', None)
+    input_directory = os.environ.get('TIRA_INPUT_DATASET', None)
 
     if input_directory:
         print(f'I will read the input data from {input_directory}.')
@@ -100,8 +100,8 @@ def register_rerank_data_to_ir_datasets(path_to_rerank_file, ir_dataset_id, orig
 
 def persist_and_normalize_run(run, system_name, output_file=None, depth=1000):
     if output_file is None:
-        print('I use the environment variable "TIRA_OUTPUT_DIRECTORY" to determine where I should store the run file using "." as default.')
-        output_file = os.environ.get('TIRA_OUTPUT_DIRECTORY', '.')
+        print('I use the environment variable "TIRA_OUTPUT_DIR" to determine where I should store the run file using "." as default.')
+        output_file = os.environ.get('TIRA_OUTPUT_DIR', '.')
 
     if not output_file.endswith('run.txt'):
         output_file = output_file + '/run.txt'
@@ -133,9 +133,9 @@ def normalize_run(run, system_name, depth=1000):
 
 def load_ir_datasets():
     # Detect if we are in the TIRA sandbox
-    if 'TIRA_INPUT_DIRECTORY' in os.environ:
+    if 'TIRA_INPUT_DATASET' in os.environ:
         from tira.ir_datasets_util import static_ir_datasets_from_directory
-        return static_ir_datasets_from_directory(os.environ['TIRA_INPUT_DIRECTORY'])
+        return static_ir_datasets_from_directory(os.environ['TIRA_INPUT_DATASET'])
     else:
         try:
             from tira.ir_datasets_util import ir_dataset_from_tira_fallback_to_original_ir_datasets

From 4e1807d182850ae8d497d92a186818264a3652d7 Mon Sep 17 00:00:00 2001
From: kavlahkaff <de28oser@studserv.uni-leipzig.de>
Date: Tue, 7 Nov 2023 16:24:20 +0100
Subject: [PATCH 11/17] Changed Layout of docker help details

---
 .../NewDockerSubmission.vue                   | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/application/src/tira/frontend-vuetify/src/submission-components/NewDockerSubmission.vue b/application/src/tira/frontend-vuetify/src/submission-components/NewDockerSubmission.vue
index 8bbcd315..609a9ffc 100644
--- a/application/src/tira/frontend-vuetify/src/submission-components/NewDockerSubmission.vue
+++ b/application/src/tira/frontend-vuetify/src/submission-components/NewDockerSubmission.vue
@@ -75,8 +75,9 @@ cat tira-evaluation/evaluation.prototext" expand_message="(3) Verify the evaluat
             <h3 class="text-h6 font-weight-light my-6">
               Please specify your docker software
             </h3>
-              <p class="mb-4">A software submission consists of a docker image and the command that is executed in the docker image. Please specify both below.</p>
+              <p>A software submission consists of a docker image and the command that is executed in the docker image. Please specify both below.</p>
 
+              <p class="my-4 d-flex align-start"> Choose either an existing docker image... </p>
             <v-autocomplete
                 label="Docker Image"
                 :items="docker_images"
@@ -87,6 +88,15 @@ cat tira-evaluation/evaluation.prototext" expand_message="(3) Verify the evaluat
                 :disabled="loading"
                 clearable
                 :rules="[v => !!(v && v.length) || 'Please select the docker image for the execution.']"/>
+              <v-btn
+                      class="mr-4"
+                      color="primary"
+                      :loading="refreshingInProgress"
+                      @click="refreshImages()"
+                    >
+                      refresh images
+              </v-btn>
+              <span><br v-if="$vuetify.display.mdAndDown">last refreshed: {{docker_images_last_refresh}}</span>
             </div>
                <div class="text-center mb-4">
                 <v-dialog
@@ -96,21 +106,15 @@ cat tira-evaluation/evaluation.prototext" expand_message="(3) Verify the evaluat
                   <template v-slot:activator="{ props }" class="d-flex flex-column align-center" >
                     <div>
                     <v-btn
-                      class="mr-2"
+                      class="d-flex mr-2 mb-4 mt-6 align-start"
                       color="primary"
+                      variant="plain"
                       v-bind="props"
                     >
-                      Push New Docker Image
-                    </v-btn>
-                     <v-btn
-                      color="primary"
-                      :loading="refreshingInProgress"
-                      @click="refreshImages()"
-                    >
-                      refresh images
+                      <span v-if="!$vuetify.display.mdAndDown">...or see instructions on how to add a new docker image to tira</span>
+                      <span v-if="$vuetify.display.mdAndDown">...or add new image</span>
                     </v-btn>
                    </div>
-                    <span>last refreshed: {{docker_images_last_refresh}}</span>
                   </template>
 
                   <v-card>

From 692300c3b5f98b3097f402e103c48c80914ff2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 17:13:59 +0100
Subject: [PATCH 12/17] Allow to use re-ranking inputs as traditional
 ir-dataset

---
 python-client/Makefile                        |  2 +-
 python-client/tests/ir_datasets_test.py       | 10 ++++-
 python-client/tira/__init__.py                |  2 +-
 python-client/tira/ir_datasets_util.py        | 38 +++++++++----------
 .../tira/third_party_integrations.py          | 12 +++++-
 5 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/python-client/Makefile b/python-client/Makefile
index 9eb9b60a..9241b07a 100644
--- a/python-client/Makefile
+++ b/python-client/Makefile
@@ -1,7 +1,7 @@
 build-pypi-package: run-tests
 	python3 -m build --sdist .
 	python3 -m build --wheel .
-	twine upload dist/tira-0.0.72-py3-none-any.whl dist/tira-0.0.72.tar.gz
+	twine upload dist/tira-0.0.73-py3-none-any.whl dist/tira-0.0.73.tar.gz
 
 run-tests:
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/app -w /app --entrypoint pytest webis/tira:python-client-dev-0.0.2
diff --git a/python-client/tests/ir_datasets_test.py b/python-client/tests/ir_datasets_test.py
index 8b10f5c7..0ea7a885 100644
--- a/python-client/tests/ir_datasets_test.py
+++ b/python-client/tests/ir_datasets_test.py
@@ -126,7 +126,15 @@ def test_loading_topics_via_rest_api_from_tira():
     dataset = ir_datasets.topics_file('ir-lab-jena-leipzig-wise-2023/training-20231104-training')
     
     assert dataset.endswith('/training-20231104-training/truth-data/queries.xml')
-    
+
+def test_loading_topics_via_rest_api_from_rerank_dataset_from_tira():
+    os.environ['TIRA_INPUT_DATASET'] = 'tests/resources/re-ranking-outputs'
+    ir_datasets = load_ir_datasets()
+    dataset = ir_datasets.load('workshop-on-open-web-search/re-ranking-20231027-training')
+    del os.environ['TIRA_INPUT_DATASET']
+
+    assert len([i for i in dataset.queries_iter()]) == 2
+    assert len([i for i in dataset.docs_iter()]) == 3
 
 def test_loading_queries_via_rest_api_from_tira():
     from tira.third_party_integrations import ir_datasets
diff --git a/python-client/tira/__init__.py b/python-client/tira/__init__.py
index 3e786c46..12181418 100644
--- a/python-client/tira/__init__.py
+++ b/python-client/tira/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.0.72"
+__version__ = "0.0.73"
 
diff --git a/python-client/tira/ir_datasets_util.py b/python-client/tira/ir_datasets_util.py
index cb7165f3..8c466ed0 100644
--- a/python-client/tira/ir_datasets_util.py
+++ b/python-client/tira/ir_datasets_util.py
@@ -22,7 +22,7 @@ def register_dataset_from_re_rank_file(ir_dataset_id, df_re_rank, original_ir_da
     dataset = Dataset(docs, queries, qrels, scoreddocs)
     ir_datasets.registry.register(ir_dataset_id, dataset)
     
-    __check_registration_was_successful(ir_dataset_id)
+    __check_registration_was_successful(ir_dataset_id, original_ir_datasets_id is None)
 
 
 def __docs(df, original_dataset):
@@ -207,28 +207,28 @@ def scoreddocs_iter(self):
     return DynamicScoredDocs(docs)
 
 
-def static_ir_datasets_from_directory(directory):
+def static_ir_dataset(directory, existing_ir_dataset=None):
     from ir_datasets.datasets.base import Dataset
-    queries_file = directory + '/queries.jsonl'
-    docs_file = directory
-    if os.path.isfile(docs_file + '/documents.jsonl.gz'):
-        docs_file = docs_file + '/documents.jsonl.gz'
-    else:
-        docs_file = docs_file + '/documents.jsonl'
-
-    docs = __docs(all_lines_to_pandas(docs_file, False), None)
-    queries = __queries(all_lines_to_pandas(queries_file, False), None)
-
-    class IrDatasetsFromDirectoryOnly():
+    if existing_ir_dataset is None:
+        queries_file = directory + '/queries.jsonl'
+        docs_file = directory
+        if os.path.isfile(docs_file + '/documents.jsonl.gz'):
+            docs_file = docs_file + '/documents.jsonl.gz'
+        else:
+            docs_file = docs_file + '/documents.jsonl'
+
+        docs = __docs(all_lines_to_pandas(docs_file, False), None)
+        queries = __queries(all_lines_to_pandas(queries_file, False), None)
+        return static_ir_dataset(directory, Dataset(docs, queries))
+
+    class StaticIrDatasets():
         def load(self, dataset_id):
             print(f'Load ir_dataset from "{directory}" instead of "{dataset_id}" because code is executed in TIRA.')
-            return Dataset(docs, queries)
+            return existing_ir_dataset
         def topics_file(self, dataset_id):
             return directory + '/queries.xml'
-
-    from ir_datasets.datasets.base import Dataset
     
-    return IrDatasetsFromDirectoryOnly()
+    return StaticIrDatasets()
 
 
 def ir_dataset_from_tira_fallback_to_original_ir_datasets():
@@ -258,12 +258,12 @@ def topics_file(self, tira_path):
 
     return ret
 
-def __check_registration_was_successful(ir_dataset_id):
+def __check_registration_was_successful(ir_dataset_id, ignore_qrels=True):
     import ir_datasets
     dataset = ir_datasets.load(ir_dataset_id)
 
     assert dataset.has_docs(), "dataset has no documents"
     assert dataset.has_queries(), "dataset has no queries"
-    assert dataset.has_qrels(), "dataset has no qrels"
+    assert ignore_qrels or dataset.has_qrels(), "dataset has no qrels"
     assert dataset.has_scoreddocs(), "dataset has no scored_docs"
 
diff --git a/python-client/tira/third_party_integrations.py b/python-client/tira/third_party_integrations.py
index 38f1b81a..8e8592e0 100644
--- a/python-client/tira/third_party_integrations.py
+++ b/python-client/tira/third_party_integrations.py
@@ -134,8 +134,16 @@ def normalize_run(run, system_name, depth=1000):
 def load_ir_datasets():
     # Detect if we are in the TIRA sandbox
     if 'TIRA_INPUT_DATASET' in os.environ:
-        from tira.ir_datasets_util import static_ir_datasets_from_directory
-        return static_ir_datasets_from_directory(os.environ['TIRA_INPUT_DATASET'])
+        
+        from tira.ir_datasets_util import static_ir_dataset
+
+        if os.path.isfile(os.path.join(os.environ['TIRA_INPUT_DATASET'], 'rerank.jsonl.gz')) or os.path.isfile(os.path.join(os.environ['TIRA_INPUT_DATASET'], 'rerank.jsonl')):
+            import ir_datasets as original_ir_datasets
+            register_rerank_data_to_ir_datasets(os.environ['TIRA_INPUT_DATASET'], 'dynamic-ds-in-tira')
+
+            return static_ir_dataset(os.environ['TIRA_INPUT_DATASET'], original_ir_datasets.load('dynamic-ds-in-tira'))
+
+        return static_ir_dataset(os.environ['TIRA_INPUT_DATASET'])
     else:
         try:
             from tira.ir_datasets_util import ir_dataset_from_tira_fallback_to_original_ir_datasets

From 649cfcdb6bc562fbd2932f39b8a25f1ff236d856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 18:34:40 +0100
Subject: [PATCH 13/17] Allow to use inputs without docs as traditional
 ir-dataset

---
 python-client/Makefile                        |  2 +-
 python-client/tests/ir_datasets_test.py       | 10 +++++
 .../metadata.json                             |  1 +
 .../queries.jsonl                             |  2 +
 .../queries.xml                               | 40 +++++++++++++++++++
 python-client/tira/__init__.py                |  2 +-
 python-client/tira/ir_datasets_util.py        |  3 +-
 7 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 python-client/tests/resources/sample-input-full-rank-without-documents/metadata.json
 create mode 100644 python-client/tests/resources/sample-input-full-rank-without-documents/queries.jsonl
 create mode 100644 python-client/tests/resources/sample-input-full-rank-without-documents/queries.xml

diff --git a/python-client/Makefile b/python-client/Makefile
index 9241b07a..f9a59620 100644
--- a/python-client/Makefile
+++ b/python-client/Makefile
@@ -1,7 +1,7 @@
 build-pypi-package: run-tests
 	python3 -m build --sdist .
 	python3 -m build --wheel .
-	twine upload dist/tira-0.0.73-py3-none-any.whl dist/tira-0.0.73.tar.gz
+	twine upload dist/tira-0.0.74-py3-none-any.whl dist/tira-0.0.74.tar.gz
 
 run-tests:
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/app -w /app --entrypoint pytest webis/tira:python-client-dev-0.0.2
diff --git a/python-client/tests/ir_datasets_test.py b/python-client/tests/ir_datasets_test.py
index 0ea7a885..efacd35f 100644
--- a/python-client/tests/ir_datasets_test.py
+++ b/python-client/tests/ir_datasets_test.py
@@ -54,6 +54,16 @@ def test_loading_queries_from_ir_datasets_from_custom_directory():
     assert len(list(dataset.queries_iter())) == 2
     assert queries['1'] == 'fox jumps above animal'
 
+def test_loading_queries_from_ir_datasets_from_custom_directory_2():
+    os.environ['TIRA_INPUT_DATASET'] = 'tests/resources/sample-input-full-rank-without-documents'
+    ir_datasets = load_ir_datasets()
+    del os.environ['TIRA_INPUT_DATASET']
+    dataset = ir_datasets.load('does-not-exist-and-is-not-used')
+    queries = {i.query_id: i.text for i in dataset.queries_iter()}
+
+    assert len(list(dataset.queries_iter())) == 2
+    assert queries['1'] == 'fox jumps above animal'
+
 def test_loading_documents_from_ir_datasets_from_custom_directory():
     os.environ['TIRA_INPUT_DATASET'] = 'tests/resources/sample-input-full-rank'
     ir_datasets = load_ir_datasets()
diff --git a/python-client/tests/resources/sample-input-full-rank-without-documents/metadata.json b/python-client/tests/resources/sample-input-full-rank-without-documents/metadata.json
new file mode 100644
index 00000000..6d255e57
--- /dev/null
+++ b/python-client/tests/resources/sample-input-full-rank-without-documents/metadata.json
@@ -0,0 +1 @@
+{"ir_datasets_id": "pangrams"}
diff --git a/python-client/tests/resources/sample-input-full-rank-without-documents/queries.jsonl b/python-client/tests/resources/sample-input-full-rank-without-documents/queries.jsonl
new file mode 100644
index 00000000..d743c5fc
--- /dev/null
+++ b/python-client/tests/resources/sample-input-full-rank-without-documents/queries.jsonl
@@ -0,0 +1,2 @@
+{"qid": "1", "query": "fox jumps above animal", "original_query": {"query_id": "1", "title": "fox jumps above animal", "description": "What pangrams have a fox jumping above some animal?", "narrative": "Relevant pangrams have a fox jumping over an animal (e.g., an dog). Pangrams containing a fox that is not jumping or jumps over something that is not an animal are not relevant."}}
+{"qid": "2", "query": "multiple animals including a zebra", "original_query": {"query_id": "2", "title": "multiple animals including a zebra", "description": "Which pangrams have multiple animals where one of the animals is a zebra?", "narrative": "Relevant pangrams have at least two animals, one of the animals must be a Zebra. Pangrams containing only a Zebra are not relevant."}}
diff --git a/python-client/tests/resources/sample-input-full-rank-without-documents/queries.xml b/python-client/tests/resources/sample-input-full-rank-without-documents/queries.xml
new file mode 100644
index 00000000..b0b33f3a
--- /dev/null
+++ b/python-client/tests/resources/sample-input-full-rank-without-documents/queries.xml
@@ -0,0 +1,40 @@
+<topics ir-datasets-id="pangrams">
+ <topic number="1">
+  <query>
+   fox jumps above animal
+  </query>
+  <original_query>
+   <query_id>
+    1
+   </query_id>
+   <title>
+    fox jumps above animal
+   </title>
+   <description>
+    What pangrams have a fox jumping above some animal?
+   </description>
+   <narrative>
+    Relevant pangrams have a fox jumping over an animal (e.g., an dog). Pangrams containing a fox that is not jumping or jumps over something that is not an animal are not relevant.
+   </narrative>
+  </original_query>
+ </topic>
+ <topic number="2">
+  <query>
+   multiple animals including a zebra
+  </query>
+  <original_query>
+   <query_id>
+    2
+   </query_id>
+   <title>
+    multiple animals including a zebra
+   </title>
+   <description>
+    Which pangrams have multiple animals where one of the animals is a zebra?
+   </description>
+   <narrative>
+    Relevant pangrams have at least two animals, one of the animals must be a Zebra. Pangrams containing only a Zebra are not relevant.
+   </narrative>
+  </original_query>
+ </topic>
+</topics>
\ No newline at end of file
diff --git a/python-client/tira/__init__.py b/python-client/tira/__init__.py
index 12181418..46355541 100644
--- a/python-client/tira/__init__.py
+++ b/python-client/tira/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.0.73"
+__version__ = "0.0.74"
 
diff --git a/python-client/tira/ir_datasets_util.py b/python-client/tira/ir_datasets_util.py
index 8c466ed0..5d7af875 100644
--- a/python-client/tira/ir_datasets_util.py
+++ b/python-client/tira/ir_datasets_util.py
@@ -209,6 +209,7 @@ def scoreddocs_iter(self):
 
 def static_ir_dataset(directory, existing_ir_dataset=None):
     from ir_datasets.datasets.base import Dataset
+    import pandas as pd
     if existing_ir_dataset is None:
         queries_file = directory + '/queries.jsonl'
         docs_file = directory
@@ -217,7 +218,7 @@ def static_ir_dataset(directory, existing_ir_dataset=None):
         else:
             docs_file = docs_file + '/documents.jsonl'
 
-        docs = __docs(all_lines_to_pandas(docs_file, False), None)
+        docs = __docs(all_lines_to_pandas(docs_file, False) if os.path.isfile(docs_file) else pd.DataFrame([]), None)
         queries = __queries(all_lines_to_pandas(queries_file, False), None)
         return static_ir_dataset(directory, Dataset(docs, queries))
 

From 08bdacf9ee5359a9a506f8e28b9a6e20e62e4d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 20:41:14 +0100
Subject: [PATCH 14/17] Allow to use pyterrier datasets for
 pt.transform_queries

---
 application/src/tira/data/HybridDatabase.py   |  8 +++-
 python-client/Makefile                        |  2 +-
 .../tests/irds_id_translation_test.py         | 42 +++++++++++++++++++
 .../tests/pt_query_processing_loader_test.py  | 12 ++++++
 python-client/tira/__init__.py                |  2 +-
 python-client/tira/ir_datasets_util.py        | 11 +++++
 python-client/tira/pyterrier_integration.py   | 13 ++++--
 python-client/tira/tirex.py                   | 35 +++++++++++++++-
 8 files changed, 117 insertions(+), 8 deletions(-)
 create mode 100644 python-client/tests/irds_id_translation_test.py

diff --git a/application/src/tira/data/HybridDatabase.py b/application/src/tira/data/HybridDatabase.py
index bcdbb0b0..41c92da0 100644
--- a/application/src/tira/data/HybridDatabase.py
+++ b/application/src/tira/data/HybridDatabase.py
@@ -655,17 +655,21 @@ def runs(self, task_id, dataset_id, vm_id, software_id):
                     tira_dockersoftware ON tira_run.docker_software_id = tira_dockersoftware.docker_software_id
                 LEFT JOIN
                     tira_review as tira_run_review ON tira_run.run_id = tira_run_review.run_id
+                LEFT JOIN
+                    tira_softwareclone AS software_clone ON tira_dockersoftware.docker_software_id = software_clone.docker_software_id
+                LEFT JOIN
+                    tira_softwareclone AS upload_clone ON tira_run.upload_id = software_clone.upload_id
                 WHERE
                     tira_run_review.published = TRUE AND tira_run_review.blinded = FALSE
                     AND tira_run.input_dataset_id = %s
-                    AND (tira_dockersoftware.task_id = %s OR tira_upload.task_id = %s OR tira_software.task_id = %s)
+                    AND (tira_dockersoftware.task_id = %s OR tira_upload.task_id = %s OR tira_software.task_id = %s  or software_clone.task_id = %s or upload_clone.task_id = %s)
                     AND (tira_dockersoftware.vm_id = %s OR tira_upload.vm_id = %s OR tira_software.vm_id = %s)
                     AND (tira_dockersoftware.display_name = %s OR tira_upload.display_name = %s OR tira_software.id = %s)
                     
                 ORDER BY
                     tira_run.run_id ASC;        
                 """
-        params = [dataset_id, task_id, task_id, task_id, vm_id, vm_id, vm_id, software_id, software_id, software_id]
+        params = [dataset_id, task_id, task_id, task_id, task_id, task_id, vm_id, vm_id, vm_id, software_id, software_id, software_id]
         return [i[0] for i in self.execute_raw_sql_statement(prepared_statement, params)]
 
     def get_runs_for_vm(self, vm_id, docker_software_id, upload_id, include_unpublished=True, round_floats=True, show_only_unreviewed=False):
diff --git a/python-client/Makefile b/python-client/Makefile
index f9a59620..d641f211 100644
--- a/python-client/Makefile
+++ b/python-client/Makefile
@@ -1,7 +1,7 @@
 build-pypi-package: run-tests
 	python3 -m build --sdist .
 	python3 -m build --wheel .
-	twine upload dist/tira-0.0.74-py3-none-any.whl dist/tira-0.0.74.tar.gz
+	twine upload dist/tira-0.0.75-py3-none-any.whl dist/tira-0.0.75.tar.gz
 
 run-tests:
 	docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}:/app -w /app --entrypoint pytest webis/tira:python-client-dev-0.0.2
diff --git a/python-client/tests/irds_id_translation_test.py b/python-client/tests/irds_id_translation_test.py
new file mode 100644
index 00000000..3d49cda5
--- /dev/null
+++ b/python-client/tests/irds_id_translation_test.py
@@ -0,0 +1,42 @@
+from tira.ir_datasets_util import translate_irds_id_to_tirex
+from tira.third_party_integrations import ensure_pyterrier_is_loaded
+import pyterrier as pt
+
+ensure_pyterrier_is_loaded()
+
+def test_for_tirex_id_robust04():
+    expected = 'disks45-nocr-trec-robust-2004-20230209-training'
+    actual = translate_irds_id_to_tirex( 'disks45-nocr-trec-robust-2004-20230209-training')
+    
+    assert expected == actual
+
+def test_for_tirex_id_cw09_2014():
+    expected = 'clueweb12-trec-web-2014-20230107-training'
+    actual = translate_irds_id_to_tirex('clueweb12-trec-web-2014-20230107-training')
+    
+    assert expected == actual
+
+def test_for_raw_string_robust04():
+    expected = 'disks45-nocr-trec-robust-2004-20230209-training'
+    actual = translate_irds_id_to_tirex('disks45/nocr/trec-robust-2004')
+    
+    assert expected == actual
+
+def test_for_raw_string_cw09_2014():
+    expected = 'clueweb12-trec-web-2014-20230107-training'
+    actual = translate_irds_id_to_tirex('clueweb12/trec-web-2014')
+    
+    assert expected == actual
+
+def test_for_pyterrier_dataset_robust04():
+    expected = 'disks45-nocr-trec-robust-2004-20230209-training'
+    actual = translate_irds_id_to_tirex(pt.get_dataset("irds:disks45/nocr/trec-robust-2004"))
+    
+    assert expected == actual
+
+def test_for_pyterrier_dataset_cw09_2009():
+    expected = 'clueweb09-en-trec-web-2009-20230107-training'
+    actual = translate_irds_id_to_tirex(pt.get_dataset("irds:clueweb09/en/trec-web-2009"))
+    
+    assert expected == actual
+
diff --git a/python-client/tests/pt_query_processing_loader_test.py b/python-client/tests/pt_query_processing_loader_test.py
index 1f6f10b4..151a729c 100644
--- a/python-client/tests/pt_query_processing_loader_test.py
+++ b/python-client/tests/pt_query_processing_loader_test.py
@@ -42,6 +42,18 @@ def test_rest_query_submission_with_rest_api_02():
     assert len(q(pd.DataFrame([{'qid': '303'}]))) == 1
     assert q(pd.DataFrame([{'qid': '303'}])).iloc[0].to_dict()['segmentation'] == ['hubble telescope', 'achievements']
 
+def test_rest_query_submission_with_rest_api_03():
+    from tira.rest_api_client import Client
+    from tira.third_party_integrations import ensure_pyterrier_is_loaded
+    import pyterrier as pt
+    ensure_pyterrier_is_loaded()
+    tira = Client()
+
+    q = tira.pt.transform_queries('ir-benchmarks/fschlatt/average-string', pt.get_dataset("irds:clueweb09/en/trec-web-2009"))
+    assert len(q(pd.DataFrame([{'qid': '26'}]))) == 1
+    assert q(pd.DataFrame([{'qid': '26'}])).iloc[0].to_dict()['mean_health_score'] == 168.416
+    assert q(pd.DataFrame([{'qid': '26'}])).iloc[0].to_dict()['median_health_score'] == 130.3137
+
 def query_segmentation(queries):
     queries = pd.DataFrame([{'qid': str(i)} for i in queries])
     tira = Client('tests/resources/')
diff --git a/python-client/tira/__init__.py b/python-client/tira/__init__.py
index 46355541..63e35ca8 100644
--- a/python-client/tira/__init__.py
+++ b/python-client/tira/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.0.74"
+__version__ = "0.0.75"
 
diff --git a/python-client/tira/ir_datasets_util.py b/python-client/tira/ir_datasets_util.py
index 5d7af875..eef5d8b0 100644
--- a/python-client/tira/ir_datasets_util.py
+++ b/python-client/tira/ir_datasets_util.py
@@ -1,6 +1,7 @@
 from copy import deepcopy
 from typing import NamedTuple
 from tira.io_utils import all_lines_to_pandas
+from tira.tirex import IRDS_TO_TIREX_DATASET, TIREX_DATASETS
 import os
 
 
@@ -25,6 +26,16 @@ def register_dataset_from_re_rank_file(ir_dataset_id, df_re_rank, original_ir_da
     __check_registration_was_successful(ir_dataset_id, original_ir_datasets_id is None)
 
 
+def translate_irds_id_to_tirex(dataset):
+    if type(dataset) != str:
+        if hasattr(dataset, 'irds_ref'):
+            return translate_irds_id_to_tirex(dataset.irds_ref().dataset_id())
+        else:
+            raise ValueError(f'I can not handle {dataset}.')
+    
+    return IRDS_TO_TIREX_DATASET[dataset] if dataset in IRDS_TO_TIREX_DATASET else dataset
+
+
 def __docs(df, original_dataset):
     from ir_datasets.formats import BaseDocs, GenericDoc
 
diff --git a/python-client/tira/pyterrier_integration.py b/python-client/tira/pyterrier_integration.py
index 5ac87820..c91184c6 100644
--- a/python-client/tira/pyterrier_integration.py
+++ b/python-client/tira/pyterrier_integration.py
@@ -105,6 +105,7 @@ def from_submission(self, approach, dataset=None, datasets=None):
     def from_retriever_submission(self, approach, dataset, previous_stage=None, datasets=None):
         import pyterrier as pt
         import pandas as pd
+        from tira.ir_datasets_util import translate_irds_id_to_tirex
         task, team, software = approach.split('/')
 
         if dataset and datasets:
@@ -115,7 +116,7 @@ def from_retriever_submission(self, approach, dataset, previous_stage=None, data
 
         df_ret = []
         for dataset in datasets:
-            ret, run_id = self.tira_client.download_run(task, dataset, software, team, previous_stage, return_metadata=True)
+            ret, run_id = self.tira_client.download_run(task, translate_irds_id_to_tirex(dataset), software, team, previous_stage, return_metadata=True)
             ret['qid'] = ret['query'].astype(str)
             ret['docno'] = ret['docid'].astype(str)
             del ret['query']
@@ -132,12 +133,17 @@ def transform_queries(self, approach, dataset, file_selection= '/*.jsonl'):
         from pyterrier.apply import generic
         import pandas as pd
         from glob import glob
-        glob_entry = self.tira_client.get_run_output(approach, dataset) + file_selection
+        from tira.ir_datasets_util import translate_irds_id_to_tirex
+        glob_entry = self.tira_client.get_run_output(approach, translate_irds_id_to_tirex(dataset)) + file_selection
         matching_files = glob(glob_entry)
         if len(matching_files) == 0:
             raise ValueError(f'Could not find a matching query output. Found: {matching_files}. Please specify the file_selection to resolve this.')
 
         ret = pd.read_json(matching_files[0], lines=True)
+        if 'qid' not in ret and 'query_id' in ret:
+            ret['qid'] = ret['query_id']
+            del ret['query_id']
+
         cols = [i for i in ret.columns if i not in ['qid']]
         ret = {str(i['qid']): i for _, i in ret.iterrows()}
 
@@ -152,7 +158,8 @@ def transform_documents(self, approach, dataset, file_selection= '/*.jsonl'):
         from pyterrier.apply import generic
         import pandas as pd
         from glob import glob
-        glob_entry = self.tira_client.get_run_output(approach, dataset) + file_selection
+        from tira.ir_datasets_util import translate_irds_id_to_tirex
+        glob_entry = self.tira_client.get_run_output(approach, translate_irds_id_to_tirex(dataset)) + file_selection
         matching_files = glob(glob_entry)
         if len(matching_files) == 0:
             raise ValueError('Could not find a matching document output. Found: ' + matching_files + '. Please specify the file_selection to resolve this.')
diff --git a/python-client/tira/tirex.py b/python-client/tira/tirex.py
index 86a3e53b..56ff70b7 100644
--- a/python-client/tira/tirex.py
+++ b/python-client/tira/tirex.py
@@ -1,3 +1,36 @@
+IRDS_TO_TIREX_DATASET = {
+    'clueweb09/en/trec-web-2009': 'clueweb09-en-trec-web-2009-20230107-training',
+    'clueweb09/en/trec-web-2010': 'clueweb09-en-trec-web-2010-20230107-training',
+    'clueweb09/en/trec-web-2011': 'clueweb09-en-trec-web-2011-20230107-training',
+    'clueweb09/en/trec-web-2012': 'clueweb09-en-trec-web-2012-20230107-training',
+    'clueweb12/trec-web-2013':'clueweb12-trec-web-2013-20230107-training',
+    'clueweb12/trec-web-2014': 'clueweb12-trec-web-2014-20230107-training',
+    'disks45/nocr/trec-robust-2004': 'disks45-nocr-trec-robust-2004-20230209-training',
+    'antique/test': 'antique-test-20230107-training',
+    'argsme/2020-04-01/touche-2020-task-1': 'argsme-touche-2020-task-1-20230209-training',
+    'argsme/2020-04-01/touche-2021-task-1': 'argsme-touche-2021-task-1-20230209-training',
+    'clueweb12/touche-2020-task-2': 'clueweb12-touche-2020-task-2-20230209-training',
+    'clueweb12/touche-2021-task-2': 'clueweb12-touche-2021-task-2-20230209-training',
+    'cord19/fulltext/trec-covid': 'cord19-fulltext-trec-covid-20230107-training',
+    'cranfield': 'cranfield-20230107-training',
+    'disks45/nocr/trec7': 'disks45-nocr-trec7-20230209-training',
+    'disks45/nocr/trec8': 'disks45-nocr-trec8-20230209-training',
+    'gov/trec-web-2002': 'gov-trec-web-2002-20230209-training',
+    'gov/trec-web-2003': 'gov-trec-web-2003-20230209-training',
+    'gov/trec-web-2004': 'gov-trec-web-2004-20230209-training',
+    'gov2/trec-tb-2004': 'gov2-trec-tb-2004-20230209-training',
+    'gov2/trec-tb-2005': 'gov2-trec-tb-2005-20230209-training',
+    'gov2/trec-tb-2006': 'gov2-trec-tb-2006-20230209-training',
+    'medline/2004/trec-genomics-2004': 'medline-2004-trec-genomics-2004-20230107-training',
+    'medline/2004/trec-genomics-2005': 'medline-2004-trec-genomics-2005-20230107-training',
+    'medline/2017/trec-pm-2017': 'medline-2017-trec-pm-2017-20230211-training',
+    'medline/2017/trec-pm-2018': 'medline-2017-trec-pm-2018-20230211-training',
+    'msmarco-passage/trec-dl-2019/judged': 'msmarco-passage-trec-dl-2019-judged-20230107-training',
+    'msmarco-passage/trec-dl-2020/judged': 'msmarco-passage-trec-dl-2020-judged-20230107-training',
+    'nfcorpus/test': 'nfcorpus-test-20230107-training',
+    'vaswani': 'vaswani-20230107-training',
+    'wapo/v2/trec-core-2018': 'wapo-v2-trec-core-2018-20230107-training'
+}
 
-TIREX_DATASETS = ['antique-test-20230107-training', 'argsme-touche-2020-task-1-20230209-training', 'argsme-touche-2021-task-1-20230209-training', 'clueweb09-en-trec-web-2009-20230107-training', 'clueweb09-en-trec-web-2010-20230107-training', 'clueweb09-en-trec-web-2011-20230107-training', 'clueweb09-en-trec-web-2012-20230107-training', 'clueweb12-touche-2020-task-2-20230209-training', 'clueweb12-touche-2021-task-2-20230209-training', 'clueweb12-trec-web-2013-20230107-training', 'clueweb12-trec-web-2014-20230107-training', 'cord19-fulltext-trec-covid-20230107-training', 'cranfield-20230107-training', 'disks45-nocr-trec-robust-2004-20230209-training', 'disks45-nocr-trec7-20230209-training', 'disks45-nocr-trec8-20230209-training', 'gov-trec-web-2002-20230209-training', 'gov-trec-web-2003-20230209-training', 'gov-trec-web-2004-20230209-training', 'gov2-trec-tb-2004-20230209-training', 'gov2-trec-tb-2005-20230209-training', 'gov2-trec-tb-2006-20230209-training', 'medline-2004-trec-genomics-2004-20230107-training', 'medline-2004-trec-genomics-2005-20230107-training', 'medline-2017-trec-pm-2017-20230211-training', 'medline-2017-trec-pm-2018-20230211-training', 'msmarco-passage-trec-dl-2019-judged-20230107-training', 'msmarco-passage-trec-dl-2020-judged-20230107-training', 'nfcorpus-test-20230107-training', 'vaswani-20230107-training', 'wapo-v2-trec-core-2018-20230107-training']
+TIREX_DATASETS = IRDS_TO_TIREX_DATASET.values()
 

From c9af478db8d7f19d79b9fef263bc6bd6dcd93d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Tue, 7 Nov 2023 21:12:17 +0100
Subject: [PATCH 15/17] Add more components

---
 application/src/tirex-components.yml | 50 +++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/application/src/tirex-components.yml b/application/src/tirex-components.yml
index 1f64fb7a..d767c3b3 100644
--- a/application/src/tirex-components.yml
+++ b/application/src/tirex-components.yml
@@ -123,6 +123,14 @@
         - display_name: Tutorial
           href: https://github.com/OpenWebSearch/wows-code/blob/main/ecir24/post-hoc-notebooks/keyphrase-extraction.ipynb
           target: _blank
+    - display_name: Health Classification
+      links:
+        - display_name: Tutorial
+          href: https://github.com/webis-de/ir-pad/tree/public/tutorials#research-tutorial-classification-of-medicalhealth-queries-and-documents
+          target: _blank
+        - display_name: Paper
+          href: https://webis.de/publications.html?q=health#schlatt_2022a
+          target: _blank
 
     - display_name: Stemming
       links:
@@ -173,8 +181,40 @@
           target: _blank
       components:
         - display_name: hyp-a
+          links: 
+            - display_name: Tutorial
+              href: https://github.com/webis-de/ir-pad/tree/public/tutorials#tutorial-8-query-segmentation-in-progress-by-maik
+              target: _blank
+
         - display_name: hyp-b
-        - display_name: hyp-c
+          links: 
+            - display_name: Tutorial
+              href: https://github.com/webis-de/ir-pad/tree/public/tutorials#tutorial-8-query-segmentation-in-progress-by-maik
+              target: _blank
+
+        - display_name: hyp-i
+          links: 
+            - display_name: Tutorial
+              href: https://github.com/webis-de/ir-pad/tree/public/tutorials#tutorial-8-query-segmentation-in-progress-by-maik
+              target: _blank
+
+        - display_name: wt-snp
+          links: 
+            - display_name: Tutorial
+              href: https://github.com/webis-de/ir-pad/tree/public/tutorials#tutorial-8-query-segmentation-in-progress-by-maik
+              target: _blank
+
+        - display_name: wiki
+          links: 
+            - display_name: Tutorial
+              href: https://github.com/webis-de/ir-pad/tree/public/tutorials#tutorial-8-query-segmentation-in-progress-by-maik
+              target: _blank
+
+        - display_name: naive
+          links: 
+            - display_name: Tutorial
+              href: https://github.com/webis-de/ir-pad/tree/public/tutorials#tutorial-8-query-segmentation-in-progress-by-maik
+              target: _blank
 
     - display_name: QPP
       links:
@@ -188,6 +228,14 @@
         - display_name: qpp-4
         - display_name: qpp-5
 
+    - display_name: Health Classification
+      links:
+        - display_name: Tutorial
+          href: https://github.com/webis-de/ir-pad/tree/public/tutorials#research-tutorial-classification-of-medicalhealth-queries-and-documents
+          target: _blank
+        - display_name: Paper
+          href: https://webis.de/publications.html?q=health#schlatt_2022a
+          target: _blank
 
 - display_name: Retrieval
   components:

From 901bdb014d385e60e58b0d16ddca6072b941e5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Wed, 8 Nov 2023 06:57:23 +0100
Subject: [PATCH 16/17] Allow to render components on mobile.

---
 .../frontend-vuetify/src/IrComponents.vue     | 36 +++++++++++--------
 .../frontend-vuetify/src/components/index.ts  |  9 ++++-
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/application/src/tira/frontend-vuetify/src/IrComponents.vue b/application/src/tira/frontend-vuetify/src/IrComponents.vue
index 0d24a123..237b77a7 100644
--- a/application/src/tira/frontend-vuetify/src/IrComponents.vue
+++ b/application/src/tira/frontend-vuetify/src/IrComponents.vue
@@ -40,7 +40,7 @@
     </v-row>
 
 
-    <div class="d-none d-md-block">
+    <div>
       <v-row class="justify-center mx-2" v-for="(row, _) of vectorizedComponents">
         <v-col v-for="(cell, i) in row" cols="cell.cols">
           <v-menu>
@@ -65,21 +65,12 @@
         </v-col>
       </v-row>
     </div>
-    <div class="d-md-none">
-      <v-row class="justify-center mx-2" v-for="display_name in colors">
-        <v-col cols="12">
-          <v-card class="mx-auto" :max-width="max_width" variant="tonal" style="cursor: pointer;">
-            <v-card-item><span class="text-h6 mb-1">{{ display_name }}</span><span style="font-size: .7em;" >TODO...</span></v-card-item>
-          </v-card>
-        </v-col>
-      </v-row>
-    </div>
   </div>
 </template>
 
 
 <script lang="ts">
-import { Loading } from './components'
+import { Loading, is_mobile } from './components'
 import { get, reportError, inject_response } from './utils';
 export default {
   name: "ir-components",
@@ -108,6 +99,7 @@ export default {
     colorOfComponent(c:string) {
       return this.colors[c] ?? "grey"
     },
+    is_mobile() {return is_mobile()},
     collapseItem(c:string) {
       this.expanded_entries = this.expanded_entries.filter(e => e != c)
     },
@@ -168,13 +160,12 @@ export default {
   computed: {
     vectorizedComponents() {
       let ret: [any[]] = [[{}, {}, {}, {}, {}, {}]]
-      let cols = 2;//this.mobileLayout() ? 12 : 2;
+      let cols = is_mobile() ? 12 : 2;
 
       for (let i in this.tirex_components) {
         let c = this.tirex_components[i]
 
-        ret[0][i] = {'display_name': c.display_name, 'cols': cols, 'links': c.links, 'collapsed': this.is_collapsed(c), 
-            'subItems':this.countSubItems(c)}
+        ret[0][i] = {'display_name': c.display_name, 'cols': cols, 'links': c.links, 'collapsed': this.is_collapsed(c), 'subItems':this.countSubItems(c)}
 
         for (let subcomponent of this.filtered_sub_components(c)) {
           if (subcomponent['pos'] >= ret.length) {
@@ -190,7 +181,22 @@ export default {
           }
         }
       }
-      
+
+      if (is_mobile()) {
+        let new_ret = []
+        for(let i=0; i< 100; i++) {
+          for (let j=0; j< ret.length && i < ret[j].length ; j++) {
+            const cell = ret[j][i]
+            if(cell && cell.hasOwnProperty('display_name')) {
+              console.log(cell['display_name'])
+              new_ret.push([cell])
+            }
+          }
+        }
+
+        return new_ret
+      }
+
       return ret
     },
   }
diff --git a/application/src/tira/frontend-vuetify/src/components/index.ts b/application/src/tira/frontend-vuetify/src/components/index.ts
index bcd055f7..24042443 100644
--- a/application/src/tira/frontend-vuetify/src/components/index.ts
+++ b/application/src/tira/frontend-vuetify/src/components/index.ts
@@ -15,4 +15,11 @@ import SubissionIcon from "./SubmissionIcon.vue"
 import ConfirmDelete from "./ConfirmDelete.vue"
 import CodeSnippet from "./CodeSnippet.vue"
 
-export {Loading, RunActions, RunList, SoftwareDetails, SubmitButton, TiraBreadcrumb, TiraTaskAdmin, TaskDocumentation, RegisterForm, LoginToSubmit, ExistingDockerSubmission, NewDockerSubmission, EditTask, SubissionIcon, ConfirmDelete, CodeSnippet}
+import { useDisplay } from 'vuetify'
+
+function is_mobile() {   
+    const { mobile } = useDisplay()
+    return mobile.value
+}
+
+export {Loading, RunActions, RunList, SoftwareDetails, SubmitButton, TiraBreadcrumb, TiraTaskAdmin, TaskDocumentation, RegisterForm, LoginToSubmit, ExistingDockerSubmission, NewDockerSubmission, EditTask, SubissionIcon, ConfirmDelete, CodeSnippet, is_mobile}

From 5711a9192cf383ad8f18f8926f85e3fdee971419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maik=20Fr=C3=B6be?= <maik.froebe@uni-jena.de>
Date: Wed, 8 Nov 2023 07:44:15 +0100
Subject: [PATCH 17/17] Improve click dummy on mobile.

---
 .../frontend-vuetify/src/IrComponents.vue     |  14 +-
 application/src/tirex-components.yml          | 236 ++++++++++--------
 2 files changed, 149 insertions(+), 101 deletions(-)

diff --git a/application/src/tira/frontend-vuetify/src/IrComponents.vue b/application/src/tira/frontend-vuetify/src/IrComponents.vue
index 237b77a7..da4376ab 100644
--- a/application/src/tira/frontend-vuetify/src/IrComponents.vue
+++ b/application/src/tira/frontend-vuetify/src/IrComponents.vue
@@ -87,7 +87,7 @@ export default {
         'Query Processing': 'yellow-darken-4', 'Retrieval': 'cyan-lighten-1',
         'Re-Ranking': 'cyan-darken-3', 'Evaluation': 'blue-grey-lighten-1'
       } as {[key: string]: string},
-      expanded_entries: ['Dataset', 'Document Processing', 'Query Processing', 'Retrieval', 'Re-Ranking', 'Evaluation'],
+      expanded_entries: ['does-not-exist'],
       component_filter: null,
       component_types: ['TIREx Submission', 'Tutorial'],
       available_component_types: ['Code', 'TIREx Submission', 'Tutorial'],
@@ -118,7 +118,7 @@ export default {
       return ret
     },
     is_collapsed(component:any) {
-      return !this.expanded_entries.includes(component.display_name)
+      return !this.computed_expanded_entries.includes(component.display_name)
     },
     filtered_sub_components(component:any) : {display_name: string, subItems: number, pos: number, links: any[]}[] {
       let ret: {display_name: string, subItems: number, pos: number, links: any[]}[] = []
@@ -158,6 +158,15 @@ export default {
       .catch(reportError("Problem While Loading the overview of the components.", "This might be a short-term hiccup, please try again. We got the following error: "))
   },
   computed: {
+    computed_expanded_entries() {
+      let ret = [...this.expanded_entries];
+      if(!is_mobile()) {
+        ret = ret.concat(['Dataset', 'Document Processing', 'Query Processing', 'Retrieval',
+        'Re-Ranking', 'Evaluation'])
+      }
+
+      return ret
+    },
     vectorizedComponents() {
       let ret: [any[]] = [[{}, {}, {}, {}, {}, {}]]
       let cols = is_mobile() ? 12 : 2;
@@ -188,7 +197,6 @@ export default {
           for (let j=0; j< ret.length && i < ret[j].length ; j++) {
             const cell = ret[j][i]
             if(cell && cell.hasOwnProperty('display_name')) {
-              console.log(cell['display_name'])
               new_ret.push([cell])
             }
           }
diff --git a/application/src/tirex-components.yml b/application/src/tirex-components.yml
index d767c3b3..0b0c8f8a 100644
--- a/application/src/tirex-components.yml
+++ b/application/src/tirex-components.yml
@@ -19,103 +19,122 @@
           href: https://ir-datasets.com/antique.html
           target: _blank
     
-    - display_name: ClueWeb09
-      links:
-        - display_name: Dataset Description
-          href: https://lemurproject.org/clueweb09.php/
-          target: _blank
+    - display_name: Web Search
       components:
-        - display_name: TREC Web Track 2010
-          links:
-          - display_name: ir_datastes
-            href: https://ir-datasets.com/clueweb09.html#clueweb09/en/trec-web-2009
+      - display_name: ClueWeb09
+        links:
+          - display_name: Dataset Description
+            href: https://lemurproject.org/clueweb09.php/
             target: _blank
-        - display_name: TREC Web Track 2010
-          links:
-            - display_name: ir_datastes
-              href: https://ir-datasets.com/clueweb09.html#clueweb09/en/trec-web-2010
-              target: _blank
-        - display_name: TREC Web Track 2011
-          links:
-            - display_name: ir_datastes
-              href: https://ir-datasets.com/clueweb09.html#clueweb09/en/trec-web-2011
-              target: _blank
-        - display_name: TREC Web Track 2012
-          links:
-            - display_name: ir_datastes
-              href: https://ir-datasets.com/clueweb09.html#clueweb09/en/trec-web-2012
-    - display_name: ClueWeb12
-      links:
-        - display_name: Dataset Description
-          href: https://lemurproject.org/clueweb12.php/
-          target: _blank
-      components:
-        - display_name: TREC Web Track 2013
-          links:
-            - display_name: ir_datastes
-              href: https://ir-datasets.com/clueweb12.html#clueweb12/trec-web-2013
-              target: _blank
-        - display_name: TREC Web Track 2014
-          links:
-            - display_name: ir_datastes
-              href: https://ir-datasets.com/clueweb12.html#clueweb12/trec-web-2014
-              target: _blank
-        - display_name: Touché 2020 (Task 2)
-          links:
+        components:
+          - display_name: TREC Web Track 2010
+            links:
             - display_name: ir_datastes
-              href: https://ir-datasets.com/clueweb12.html#clueweb12/touche-2020-task-2
+              href: https://ir-datasets.com/clueweb09.html#clueweb09/en/trec-web-2009
               target: _blank
-        - display_name: Touché 2021 (Task 2)
-          links:
+          - display_name: TREC Web Track 2010
+            links:
+              - display_name: ir_datastes
+                href: https://ir-datasets.com/clueweb09.html#clueweb09/en/trec-web-2010
+                target: _blank
+          - display_name: TREC Web Track 2011
+            links:
+              - display_name: ir_datastes
+                href: https://ir-datasets.com/clueweb09.html#clueweb09/en/trec-web-2011
+                target: _blank
+          - display_name: TREC Web Track 2012
+            links:
+              - display_name: ir_datastes
+                href: https://ir-datasets.com/clueweb09.html#clueweb09/en/trec-web-2012
+      - display_name: ClueWeb12
+        links:
+          - display_name: Dataset Description
+            href: https://lemurproject.org/clueweb12.php/
+            target: _blank
+        components:
+          - display_name: TREC Web Track 2013
+            links:
+              - display_name: ir_datastes
+                href: https://ir-datasets.com/clueweb12.html#clueweb12/trec-web-2013
+                target: _blank
+          - display_name: TREC Web Track 2014
+            links:
+              - display_name: ir_datastes
+                href: https://ir-datasets.com/clueweb12.html#clueweb12/trec-web-2014
+                target: _blank
+          - display_name: Touché 2020 (Task 2)
+            links:
+              - display_name: ir_datastes
+                href: https://ir-datasets.com/clueweb12.html#clueweb12/touche-2020-task-2
+                target: _blank
+          - display_name: Touché 2021 (Task 2)
+            links:
             - display_name: ir_datastes
               href: https://ir-datasets.com/clueweb12.html#clueweb12/touche-2021-task-2
               target: _blank
-    - display_name: ClueWeb22
-      links:
-        - display_name: Dataset Description
-          href: https://lemurproject.org/clueweb22.php/
-          target: _blank
-      components:
-        - display_name: Touché 2023 (Task 1)
-          links:
-            - display_name: Task Page
-              href: https://touche.webis.de/clef23/touche23-web/argument-retrieval-for-controversial-questions.html
-              target: _blank
-        - display_name: Touché 2023 (Task 2)
-          links:
-            - display_name: Task Page
-              href: https://touche.webis.de/clef23/touche23-web/evidence-retrieval-for-causal-questions.html
-              target: _blank
-    - display_name: CORD-19
-    - display_name: Disks4+5
-    - display_name: GOV
-    - display_name: GOV2
-    - display_name: LongEval
-      links:
-        - display_name: Dataset Description
-          href: https://dl.acm.org/doi/abs/10.1145/3539618.3591921
-          target: _blank
+      - display_name: ClueWeb22
+        links:
+          - display_name: Dataset Description
+            href: https://lemurproject.org/clueweb22.php/
+            target: _blank
+        components:
+          - display_name: Touché 2023 (Task 1)
+            links:
+              - display_name: Task Page
+                href: https://touche.webis.de/clef23/touche23-web/argument-retrieval-for-controversial-questions.html
+                target: _blank
+          - display_name: Touché 2023 (Task 2)
+            links:
+              - display_name: Task Page
+                href: https://touche.webis.de/clef23/touche23-web/evidence-retrieval-for-causal-questions.html
+                target: _blank
+
+      - display_name: GOV
+      - display_name: GOV2
+      - display_name: LongEval
+        links:
+          - display_name: Dataset Description
+            href: https://dl.acm.org/doi/abs/10.1145/3539618.3591921
+            target: _blank
+        components:
+          - display_name: LongEval 2023
+            links:
+              - display_name: Task Page
+                href: https://clef-longeval-2023.github.io/
+                target: _blank
+          - display_name: LongEval 2024
+            links:
+              - display_name: Task Page
+                href: https://clef-longeval.github.io/
+                target: _blank
+
+    - display_name: Medical Search
       components:
-        - display_name: LongEval 2023
-          links:
-            - display_name: Task Page
-              href: https://clef-longeval-2023.github.io/
-              target: _blank
-        - display_name: LongEval 2024
-          links:
-            - display_name: Task Page
-              href: https://clef-longeval.github.io/
-              target: _blank
-    - display_name: MEDLINE
+      - display_name: CORD-19
+      - display_name: MEDLINE
+      - display_name: NFCorpus
+
     - display_name: MS MARCO
-    - display_name: NFCorpus
+      components:
+      - display_name: Deep Learning 19
+      - display_name: Deep Learning 20
+
+    - display_name: News Search
+      components:
+      - display_name: WaPo
+      - display_name: Disks4+5
+        components:
+        - display_name: Robust04
+        - display_name: TREC 7
+        - display_name: TREC 8
+
     - display_name: Tip-of-the-Tongue
       links:
         - display_name: Task Overview
           href: https://trec-tot.github.io/
           target: _blank
     - display_name: Vaswani
-    - display_name: WaPo
+
 - display_name: Document Processing
   components:
     - display_name: Keyphrase Extraction
@@ -239,26 +258,47 @@
 
 - display_name: Retrieval
   components:
-    - display_name: BM25
-      links:
-        - display_name: Submission in TIREx
-          href: /task-overview/ir-benchmarks
-    - display_name: TF-IDF
-      links:
-        - display_name: Submission in TIREx
-          href: /task-overview/ir-benchmarks/
-    - display_name: PL2
-      links:
-        - display_name: Submission in TIREx
-          href: /task-overview/ir-benchmarks/
+    - display_name: Dense Retrieval
+      components:
+        - display_name: TBD 1
+        - display_name: TBD 2
+        - display_name: TBD 3
+    - display_name: Lexical Retrieval
+      components:
+      - display_name: BM25
+        links:
+          - display_name: Submission in TIREx
+            href: /task-overview/ir-benchmarks
+      - display_name: TF-IDF
+        links:
+          - display_name: Submission in TIREx
+            href: /task-overview/ir-benchmarks/
+      - display_name: PL2
+        links:
+          - display_name: Submission in TIREx
+            href: /task-overview/ir-benchmarks/
 
 
 - display_name: Re-Ranking
   components:
-    - display_name: monoT5
-      links:
-        - display_name: Submission in TIREx
-          href: /task-overview/ir-benchmarks/
+    - display_name: Cross Encoder
+      components:
+      - display_name: monoT5
+        links:
+          - display_name: Submission in TIREx
+            href: /task-overview/ir-benchmarks/
+      - display_name: TBD 1
+      - display_name: TBD 2
+    - display_name: Dense Retrieval
+      components:
+        - display_name: TBD 1
+        - display_name: TBD 2
+        - display_name: TBD 3
+    - display_name: Lexical Retrieval
+      components:
+        - display_name: TBD 1
+        - display_name: TBD 2
+        - display_name: TBD 3
     - display_name: Rank Fusion
       links:
         - display_name: Ranx