already resolve the app version in wrapper creator

app_runner/src/app_runner/bfabric_app/workunit_wrapper_data.py

@@ -2,12 +2,10 @@
 
 from pydantic import BaseModel
 
-from app_runner.specs.app.app_spec import AppSpecTemplate  # noqa: TC001
+from app_runner.specs.app.app_version import AppVersion  # noqa: TC001
 from bfabric.experimental.workunit_definition import WorkunitDefinition  # noqa: TC002
 
 
 class WorkunitWrapperData(BaseModel):
-    # TODO this could be revisited in the future, e.g. whether we want to merge this part into the app_definition
-    # TODO should the template be substituted already?
-    workunit: WorkunitDefinition
-    app: AppSpecTemplate
+    workunit_definition: WorkunitDefinition
+    app_version: AppVersion

app_runner/src/app_runner/bfabric_app/wrapper_creator.py

@@ -8,6 +8,7 @@
 import yaml
 from loguru import logger
 
+from app_runner.app_runner.resolve_app import resolve_app
 from app_runner.bfabric_app.workunit_wrapper_data import WorkunitWrapperData
 from app_runner.specs.app.app_spec import AppSpecTemplate
 from bfabric import Bfabric  # noqa: TC002
@@ -43,8 +44,11 @@ def get_data(self) -> WorkunitWrapperData:
         workunit_definition = WorkunitDefinition.from_workunit(workunit=self._workunit)
         # TODO could this be made more robust in the future, e.g. by specifying the root path somehow?
         path = Path(self._workunit.application.executable["program"])
-        application_definition = AppSpecTemplate.model_validate(yaml.safe_load(path.read_text()))
-        return WorkunitWrapperData(workunit=workunit_definition, app=application_definition)
+        app_spec_template = AppSpecTemplate.model_validate(yaml.safe_load(path.read_text()))
+        app = self._workunit.application
+        app_spec = app_spec_template.evaluate(app_id=str(app.id), app_name=app["name"])
+        app_version = resolve_app(versions=app_spec, workunit_definition=workunit_definition)
+        return WorkunitWrapperData(workunit_definition=workunit_definition, app_version=app_version)
 
     def run(self) -> None:
         data = self.get_data()