From 50f25079c2f4fc8c94b8cbbe0df6ac7a240b3c80 Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Tue, 5 May 2026 16:21:41 -0700 Subject: [PATCH 1/2] Encode commit hash in metadata --- .../data_mappers/_acquisition.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/packages/aind_behavior_vr_foraging/src/aind_behavior_vr_foraging/data_mappers/_acquisition.py b/src/packages/aind_behavior_vr_foraging/src/aind_behavior_vr_foraging/data_mappers/_acquisition.py index 4696c275..85716525 100644 --- a/src/packages/aind_behavior_vr_foraging/src/aind_behavior_vr_foraging/data_mappers/_acquisition.py +++ b/src/packages/aind_behavior_vr_foraging/src/aind_behavior_vr_foraging/data_mappers/_acquisition.py @@ -21,6 +21,7 @@ from clabe.data_mapper import helpers as data_mapper_helpers from pydantic import AwareDatetime +from aind_behavior_vr_foraging import __semver__ from aind_behavior_vr_foraging.data_contract.utils import calculate_consumed_water from aind_behavior_vr_foraging.rig import AindVrForagingRig from aind_behavior_vr_foraging.task_logic import AindVrForagingTaskLogic @@ -339,9 +340,8 @@ def _get_bonsai_as_code(self) -> acquisition.Code: return acquisition.Code( url=self.repository.remote().url, name="Aind.Behavior.VrForaging", - version=self.repository.head.commit.hexsha, - # version=__semver__, # TODO slot this in when this is solved https://github.com/AllenNeuralDynamics/aind-data-schema/issues/1789 - # sha=self.repository.head.commit.hexsha, + version=__semver__, + commit_hash=self.repository.head.commit.hexsha, language="Bonsai", language_version=bonsai_version, run_script=Path(self.bonsai_app.workflow), @@ -357,7 +357,8 @@ def _get_python_as_code(self) -> acquisition.Code: return acquisition.Code( url=self.repository.remote().url, name="aind-behavior-vr-foraging", - version=self.repository.head.commit.hexsha, + version=__semver__, + commit_hash=self.repository.head.commit.hexsha, language="Python", language_version=semver, ) @@ -372,7 +373,7 @@ def _get_curriculum_as_code(self) -> acquisition.Code: raise ValueError("Trainer state or curriculum is not set in the curriculum suggestion.") return acquisition.Code( url=self.repository.remote().url, - # sha=self.repository.head.commit.hexsha, # TODO see https://github.com/AllenNeuralDynamics/aind-data-schema/issues/1789 + commit_hash=self.repository.head.commit.hexsha, name=self.curriculum_suggestion.trainer_state.curriculum.pkg_location, version=self.curriculum_suggestion.trainer_state.curriculum.version, language="aind-behavior-curriculum", From d5d3641b8dc4366c2f031560046d4de67f38368a Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Thu, 7 May 2026 07:56:20 -0700 Subject: [PATCH 2/2] Update aind-data-schema dependency --- .../aind_behavior_vr_foraging/pyproject.toml | 2 +- uv.lock | 21 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/packages/aind_behavior_vr_foraging/pyproject.toml b/src/packages/aind_behavior_vr_foraging/pyproject.toml index f419ee39..ba9e0882 100644 --- a/src/packages/aind_behavior_vr_foraging/pyproject.toml +++ b/src/packages/aind_behavior_vr_foraging/pyproject.toml @@ -32,7 +32,7 @@ data = ["contraqctor>=0.5.5, <0.6.0"] mappers = [ "aind-clabe[aind-services]>=0.10.4", - "aind-data-schema>=2.6", + "aind-data-schema>=2.7", "aind-behavior-vr-foraging[data]", ] diff --git a/uv.lock b/uv.lock index 3c9542cb..b9f84f2c 100644 --- a/uv.lock +++ b/uv.lock @@ -102,7 +102,7 @@ requires-dist = [ { name = "aind-behavior-services", specifier = ">=0.13.6" }, { name = "aind-behavior-vr-foraging", extras = ["data"], marker = "extra == 'mappers'", editable = "src/packages/aind_behavior_vr_foraging" }, { name = "aind-clabe", extras = ["aind-services"], marker = "extra == 'mappers'", specifier = ">=0.10.4" }, - { name = "aind-data-schema", marker = "extra == 'mappers'", specifier = ">=2.6" }, + { name = "aind-data-schema", marker = "extra == 'mappers'", specifier = ">=2.7" }, { name = "contraqctor", marker = "extra == 'data'", specifier = ">=0.5.5,<0.6.0" }, { name = "pydantic-settings" }, ] @@ -185,16 +185,17 @@ aind-services = [ [[package]] name = "aind-data-schema" -version = "2.6.0" +version = "2.7.1" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "aind-data-schema-models" }, { name = "pydantic" }, { name = "pydantic-extra-types" }, + { name = "tzdata" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/3e/04/fb661b20352d9768f1a777f5a26a4948ebeb40b49c6d0ddbe2004351aa97/aind_data_schema-2.6.0.tar.gz", hash = "sha256:921bf9e45a4d9671f883a79219119841de3d907928568c0f6f610d029ab2babf", size = 901339, upload-time = "2026-03-09T18:25:36.958Z" } +sdist = { url = "https://files.pythonhosted.org/packages/5f/20/adea7aec869cdc84a820414988a32ed5b1fdc20e0ce7c6f145b1b4486275/aind_data_schema-2.7.1.tar.gz", hash = "sha256:ad21d009f801a33baa52f7d28f00be03698adf04502334f428670ccfacc1a48d", size = 912389, upload-time = "2026-05-07T01:48:41.855Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/a5/71/905924fa2483bb4bcc08218cc43119a790a859e695a1c28253711b11ec0d/aind_data_schema-2.6.0-py3-none-any.whl", hash = "sha256:dfc868930c9e2ee2fe8ca40ef3dc2d0502db59e44bd76c577fdecde77d73ac48", size = 92081, upload-time = "2026-03-09T18:25:35.332Z" }, + { url = "https://files.pythonhosted.org/packages/ba/5b/ea2ec6ff2a0e9258a4aa97075f30bb0040c4c875a421aa2837c314192773/aind_data_schema-2.7.1-py3-none-any.whl", hash = "sha256:e81fd92bcd4d479f9a6636b054f18635bd20fb20b6f82159af9b66beac2963fe", size = 93639, upload-time = "2026-05-07T01:48:40.236Z" }, ] [[package]] @@ -856,14 +857,14 @@ wheels = [ [[package]] name = "gitpython" -version = "3.1.49" +version = "3.1.50" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "gitdb" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/e1/63/210aaa302d6a0a78daa67c5c15bbac2cad361722841278b0209b6da20855/gitpython-3.1.49.tar.gz", hash = "sha256:42f9399c9eb33fc581014bedd76049dfbaf6375aa2a5754575966387280315e1", size = 219367, upload-time = "2026-04-29T00:31:20.478Z" } +sdist = { url = "https://files.pythonhosted.org/packages/33/f6/354ae6491228b5eb40e10d89c4d13c651fe1cf7556e35ebdded50cff57ce/gitpython-3.1.50.tar.gz", hash = "sha256:80da2d12504d52e1f998772dc5baf6e553f8d2fcfe1fcc226c9d9a2ee3372dcc", size = 219798, upload-time = "2026-05-06T04:01:26.571Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/fd/6f/b842bfa6f21d6f87c57f9abf7194225e55279d96d869775e19e9f7236fc5/gitpython-3.1.49-py3-none-any.whl", hash = "sha256:024b0422d7f84d15cd794844e029ffebd4c5d42a7eb9b936b458697ef550a02c", size = 212190, upload-time = "2026-04-29T00:31:18.412Z" }, + { url = "https://files.pythonhosted.org/packages/20/7a/1c6e3562dfd8950adbb11ffbc65d21e7c89d01a6e4f137fa981056de25c5/gitpython-3.1.50-py3-none-any.whl", hash = "sha256:d352abe2908d07355014abdd21ddf798c2a961469239afec4962e9da884858f9", size = 212507, upload-time = "2026-05-06T04:01:23.799Z" }, ] [[package]] @@ -1171,14 +1172,14 @@ wheels = [ [[package]] name = "markdown-it-py" -version = "4.0.0" +version = "4.2.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "mdurl" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/5b/f5/4ec618ed16cc4f8fb3b701563655a69816155e79e24a17b651541804721d/markdown_it_py-4.0.0.tar.gz", hash = "sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3", size = 73070, upload-time = "2025-08-11T12:57:52.854Z" } +sdist = { url = "https://files.pythonhosted.org/packages/06/ff/7841249c247aa650a76b9ee4bbaeae59370dc8bfd2f6c01f3630c35eb134/markdown_it_py-4.2.0.tar.gz", hash = "sha256:04a21681d6fbb623de53f6f364d352309d4094dd4194040a10fd51833e418d49", size = 82454, upload-time = "2026-05-07T12:08:28.36Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/94/54/e7d793b573f298e1c9013b8c4dade17d481164aa517d1d7148619c2cedbf/markdown_it_py-4.0.0-py3-none-any.whl", hash = "sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147", size = 87321, upload-time = "2025-08-11T12:57:51.923Z" }, + { url = "https://files.pythonhosted.org/packages/b3/81/4da04ced5a082363ecfa159c010d200ecbd959ae410c10c0264a38cac0f5/markdown_it_py-4.2.0-py3-none-any.whl", hash = "sha256:9f7ebbcd14fe59494226453aed97c1070d83f8d24b6fc3a3bcf9a38092641c4a", size = 91687, upload-time = "2026-05-07T12:08:27.182Z" }, ] [[package]]