From f517d14ff965763a8f713b8a1be5dfb26b9312e1 Mon Sep 17 00:00:00 2001 From: bruno-f-cruz <7049351+bruno-f-cruz@users.noreply.github.com> Date: Tue, 30 Jun 2026 14:30:07 -0700 Subject: [PATCH] Update contraqctor dependency and skip streams that previously raised errors --- pyproject.toml | 2 +- src/aind_behavior_dynamic_foraging/data_qc/suite.py | 5 ++--- uv.lock | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4a717646..d1b0f504 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ Changelog = "https://github.com/AllenNeuralDynamics/Aind.Behavior.DynamicForagin [project.optional-dependencies] -data = ["contraqctor>=0.5.8"] +data = ["contraqctor>=0.6.0"] [dependency-groups] diff --git a/src/aind_behavior_dynamic_foraging/data_qc/suite.py b/src/aind_behavior_dynamic_foraging/data_qc/suite.py index 6204230f..b0602f72 100644 --- a/src/aind_behavior_dynamic_foraging/data_qc/suite.py +++ b/src/aind_behavior_dynamic_foraging/data_qc/suite.py @@ -35,13 +35,12 @@ def make_qc_runner(dataset: contract.Dataset) -> qc.Runner: # Exclude commands to Harp boards as these are tested separately for cmd in dataset["Behavior"]["HarpCommands"]: + if cmd.has_error: + continue for stream in cmd: if isinstance(stream, contract.harp.HarpRegister): exclude.append(stream) - # Add the outcome of the dataset loading step to the automatic qc - _runner.add_suite(qc.contract.ContractTestSuite(dataset.collect_errors(), exclude=exclude), group="Data contract") - # Add Harp tests for ALL Harp devices in the dataset for stream in (_r := dataset["Behavior"]): if isinstance(stream, HarpDevice): diff --git a/uv.lock b/uv.lock index efa9d3c7..948fd6f7 100644 --- a/uv.lock +++ b/uv.lock @@ -79,7 +79,7 @@ docs = [ [package.metadata] requires-dist = [ { name = "aind-behavior-services", specifier = ">=0.13.5" }, - { name = "contraqctor", marker = "extra == 'data'", specifier = ">=0.5.8" }, + { name = "contraqctor", marker = "extra == 'data'", specifier = ">=0.6.0" }, { name = "pydantic-settings" }, { name = "scikit-learn", specifier = ">=1.8.0" }, ] @@ -459,7 +459,7 @@ wheels = [ [[package]] name = "contraqctor" -version = "0.5.8" +version = "0.6.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "aind-behavior-services" }, @@ -476,9 +476,9 @@ dependencies = [ { name = "scipy" }, { name = "semver" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/c1/26/c9459dc2036c902a05c9c66358bba9834d3c8d4ecee64c58b3d23d6800e6/contraqctor-0.5.8.tar.gz", hash = "sha256:a91797987f2ebc4ca1c6c4fdfc7867ef8ee7a566382e8ffe1c8c289cca61a9a8", size = 55929, upload-time = "2026-06-18T09:42:15.888Z" } +sdist = { url = "https://files.pythonhosted.org/packages/e5/b3/60d189079b7f2f022d3eb5fc6ee2179b8c91e28a39e0d4b0e01dcb0effb6/contraqctor-0.6.0.tar.gz", hash = "sha256:a33b3337a687f18869bcfcafd5782d78e512d32ed2b0c42fd37df221f4d642a0", size = 58108, upload-time = "2026-06-30T21:23:56.72Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/19/9e/dc69736ba3f4c852e42299d4e2705202abcac44dc52b272019708628c93c/contraqctor-0.5.8-py3-none-any.whl", hash = "sha256:56d8e4ef87c3cbfe3c7dd6066c519fcb57341b6815ca4f7582290bd210ed4d65", size = 69225, upload-time = "2026-06-18T09:42:14.91Z" }, + { url = "https://files.pythonhosted.org/packages/e2/09/b733cd351469c8bd2fb2b5679d58132e68463f04193697986f7f731929f8/contraqctor-0.6.0-py3-none-any.whl", hash = "sha256:b62d21227487219a5745189b109002d548f3cb936df3698b278cdac4675d9cd4", size = 71990, upload-time = "2026-06-30T21:23:55.615Z" }, ] [[package]]