Merge pull request #171 from AllenNeuralDynamics/release-v0.20.2

Release v0.20.2

Author: helen-m-lin

pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     "pydantic-settings>=2.0",
     "pydantic>=2.10",
     "dask==2023.5.0",
-    "aind-data-schema==1.2.0",
+    "aind-data-schema==1.4.0",
     "codeocean==0.3.0",
     "aind-data-access-api>=1.6.0",
 ]

src/aind_data_asset_indexer/__init__.py

@@ -1,3 +1,3 @@
 """Package"""
 
-__version__ = "0.20.1"
+__version__ = "0.20.2"

tests/resources/utils/example_metadata.nd.json

@@ -94,11 +94,11 @@
          "pipeline_version": null,
          "processor_full_name": "service"
       },
-      "schema_version": "1.1.3"
+      "schema_version": "1.1.4"
    },
    "quality_control": null,
    "rig": null,
-   "schema_version": "1.1.1",
+   "schema_version": "1.2.1",
    "session": null,
    "subject": {
       "alleles": [],
@@ -117,7 +117,7 @@
       "notes": null,
       "restrictions": null,
       "rrid": null,
-      "schema_version": "1.0.0",
+      "schema_version": "1.0.3",
       "sex": "Male",
       "source": {
          "abbreviation": "AI",

tests/test_aind_bucket_indexer.py

@@ -66,7 +66,7 @@ def test_write_root_file_with_record_info_same_hash(
                     "last_modified": datetime(
                         2024, 5, 15, 17, 41, 28, tzinfo=timezone.utc
                     ),
-                    "e_tag": '"a0f1022e3b4a8bc60e63e3677171f784"',
+                    "e_tag": '"de9660c272eacf52ed43080f2ec7dba2"',
                     "version_id": "version_id",
                 },
                 prefix="ecephys_642478_2023-01-17_13-56-29",

tests/test_utils.py

@@ -141,7 +141,7 @@ def load_json_file(filename: str) -> dict:
     def test_compute_md5_hash(self):
         """Tests compute_md5_hash method"""
         md5_hash = compute_md5_hash(json.dumps(self.example_metadata_nd))
-        self.assertEqual("a0f1022e3b4a8bc60e63e3677171f784", md5_hash)
+        self.assertEqual("de9660c272eacf52ed43080f2ec7dba2", md5_hash)
 
     def test_create_object_key(self):
         """Tests create_object_key"""
@@ -683,16 +683,14 @@ def test_build_metadata_record_from_prefix(
             self.example_subject,
             self.example_processing,
         ]
-        # there are some userwarnings when creating Subject from json
-        with self.assertWarns(UserWarning):
-            # noinspection PyTypeChecker
-            md = json.loads(
-                build_metadata_record_from_prefix(
-                    bucket="aind-ephys-data-dev-u5u0i5",
-                    prefix="ecephys_642478_2023-01-17_13-56-29",
-                    s3_client=mock_s3_client,
-                )
+        # noinspection PyTypeChecker
+        md = json.loads(
+            build_metadata_record_from_prefix(
+                bucket="aind-ephys-data-dev-u5u0i5",
+                prefix="ecephys_642478_2023-01-17_13-56-29",
+                s3_client=mock_s3_client,
             )
+        )
         mock_get_dict_of_file_info.assert_called_once()
         mock_download_json_file.assert_has_calls(
             [
@@ -747,15 +745,17 @@ def test_build_metadata_record_from_prefix_with_optional_fields(
                 prefix="abc-123",
                 s3_client=mock_s3_client,
                 optional_name="ecephys_642478_2023-01-17_13-56-29",
-                optional_created=datetime(2020, 1, 2, 3, 4, 5),
+                optional_created=datetime(
+                    2020, 1, 2, 3, 4, 5, tzinfo=timezone.utc
+                ),
                 optional_external_links={"Code Ocean": ["123-456"]},
             )
         )
         mock_get_dict_of_file_info.assert_called_once()
         mock_download_json_file.assert_not_called()
         self.assertEqual("s3://code-ocean-bucket/abc-123", md["location"])
         self.assertEqual("ecephys_642478_2023-01-17_13-56-29", md["name"])
-        self.assertEqual("2020-01-02T03:04:05", md["created"])
+        self.assertEqual("2020-01-02T03:04:05Z", md["created"])
         self.assertEqual({"Code Ocean": ["123-456"]}, md["external_links"])
 
     @patch("aind_data_asset_indexer.utils.create_metadata_json")