mf

tira-io · Dec 10, 2024 · 297175c · 297175c
1 parent a452795
commit 297175c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 7 deletions.
diff --git a/application/setup.cfg b/application/setup.cfg
@@ -63,7 +63,9 @@ include =
 
 [options.package_data]
 tira_app.res = *.yml
-tira_app.templates = *
+tira_app.templates.tira = *
+tira_app.templates.tira.git_repo_template = *
+tira_app.endpoints = aha
 
 [flake8]
 max-line-length = 120

diff --git a/...mplates/tira/git-repo-template/Dockerfile → ...mplates/tira/git_repo_template/Dockerfile b/...mplates/tira/git-repo-template/Dockerfile → ...mplates/tira/git_repo_template/Dockerfile
diff --git a/...emplates/tira/git-repo-template/README.md → ...emplates/tira/git_repo_template/README.md b/...emplates/tira/git-repo-template/README.md → ...emplates/tira/git_repo_template/README.md
diff --git a/application/src/tira_app/templates/tira/git_repo_template/__init__.py b/application/src/tira_app/templates/tira/git_repo_template/__init__.py
diff --git a/.../tira/git-repo-template/github-action.yml → .../tira/git_repo_template/github-action.yml b/.../tira/git-repo-template/github-action.yml → .../tira/git_repo_template/github-action.yml
diff --git a/...emplates/tira/git-repo-template/script.py → ...emplates/tira/git_repo_template/script.py b/...emplates/tira/git-repo-template/script.py → ...emplates/tira/git_repo_template/script.py
diff --git a/application/src/tira_app/views.py b/application/src/tira_app/views.py
@@ -181,11 +181,11 @@ def download_repo_template(request, task_id, vm_id):
         ).open(
             "w"
         ) as ci:
-            readme.write(render_to_string("tira/git-repo-template/README.md", context=context))
-            dockerfile.write(render_to_string("tira/git-repo-template/Dockerfile", context=context))
+            readme.write(render_to_string("tira/git_repo_template/README.md", context=context))
+            dockerfile.write(render_to_string("tira/git_repo_template/Dockerfile", context=context))
             requirements.write("argparse")
-            script.write(render_to_string("tira/git-repo-template/script.py", context=context))
-            ci.write(render_to_string("tira/git-repo-template/github-action.yml", context=context))
+            script.write(render_to_string("tira/git_repo_template/script.py", context=context))
+            ci.write(render_to_string("tira/git_repo_template/github-action.yml", context=context))
 
         zipped = Path(tmpdirname) / f"{task_id}.zip"
         with zipfile.ZipFile(zipped, "w") as zipf:

diff --git a/python-client/tira/rest_api_client.py b/python-client/tira/rest_api_client.py
@@ -856,7 +856,7 @@ def register_group(
 
         return self.execute_post_return_json(endpoint, json_payload=body)
 
-    def modify_task(self, task_id, to_rename):
+    def modify_task(self, task_id: str, to_rename: dict[str, str]):
         task = self.metadata_for_task(task_id)["context"]["task"]
         fields_to_rename = {
             "name": "task_name",

diff --git a/python-client/tira/tira_client.py b/python-client/tira/tira_client.py
@@ -45,7 +45,7 @@ def get_run_execution_or_none(self, approach, dataset, previous_stage_run_id=Non
     def docker_registry(self):
         return "registry.webis.de"
 
-    def modify_task(self, task_id, to_rename):
+    def modify_task(self, task_id: str, to_rename: dict[str, str]):
         # .. todo:: typehint
         pass