Trying to insert bids_schema_version ... somewhere.

dandi · Nov 29, 2022 · 28d6237 · 28d6237
1 parent f087e81
commit 28d6237
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/dandi/cli/cmd_ls.py b/dandi/cli/cmd_ls.py
@@ -365,7 +365,6 @@ def fn():
                     else:
                         lgr.info("Calculating digest for %s", path)
                         digest = get_digest(path, digest="dandi-etag")
-                    print("000000000000000000000000000000000")
                     rec = get_metadata(path, Digest.dandi_etag(digest))
             except Exception as exc:
                 _add_exc_error(path, rec, errors, exc)

diff --git a/dandi/files/bids.py b/dandi/files/bids.py
@@ -85,6 +85,7 @@ def _validate(self) -> None:
                     list
                 )
                 self._asset_metadata = defaultdict(dict)
+                # self._validation_bids_version = result.origin.bids_version
                 for result in results:
                     if result.id in BIDS_ASSET_ERRORS:
                         assert result.path
@@ -100,9 +101,16 @@ def _validate(self) -> None:
                         )
                         # probably best done as part of `prepare_metadata()`
                         # pending figuring out how
-                        self._asset_metadata[bids_path][
-                            "bids_version"
-                        ] = result.metadata["wasAttributedTo"]["bids_schema_version"]
+                        print("wwwwww")
+                        print(result.origin.bids_version)
+                        print("mmmmmm")
+                        # print(result.metadata["bids_schema_version"])
+                        # print("ĸĸĸĸĸĸĸ")
+                        # bids_ver = {"bids_schema_version": result.metadata["bids_schema_version"]}
+                        # self._asset_metadata[bids_path]["wasAttributedTo"].append(bids_ver)
+                        # #self._asset_metadata[bids_path][
+                        # #    "bids_schema_version"
+                        # #] = result.metadata["bids_schema_version"]
 
     def get_asset_errors(self, asset: BIDSAsset) -> list[ValidationResult]:
         """:meta private:"""
@@ -192,10 +200,12 @@ def get_metadata(
     ) -> BareAsset:
         metadata = self.bids_dataset_description.get_asset_metadata(self)
         start_time = end_time = datetime.now().astimezone()
+        print(metadata, "\n")
         add_common_metadata(metadata, self.filepath, start_time, end_time, digest)
+        print(metadata, "\n")
         metadata["path"] = self.path
+        print(metadata, "\n")
         print("zzzzzzzzzzzzzzzzzzzzzzzzz get_metadata")
-        print(metadata)
         return BareAsset(**metadata)
 
 

diff --git a/dandi/metadata.py b/dandi/metadata.py
@@ -145,15 +145,21 @@ def get_metadata(
             bids_dataset_description=bids_dataset_description,
         )
         a = df.get_metadata(digest=digest)
+        print("kkkkkkkkkkkkk")
+        print(df._asset_metadata)
         print("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU")
+        print(type(a))
         print(a)
         print(a.wasAttributedTo[0].identifier)
         print(meta)
         print("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU")
         for key in metadata_all_fields:
-            print(key)
-            value = getattr(a.wasAttributedTo[0], key)
-            meta[key] = value
+            try:
+                value = getattr(a.wasAttributedTo[0], key)
+            except AttributeError:
+                pass
+            else:
+                meta[key] = value
         print(meta)
 
     return meta

diff --git a/dandi/validate.py b/dandi/validate.py
@@ -68,6 +68,7 @@ def validate_bids(
     origin = ValidationOrigin(
         name="bidsschematools",
         version=bidsschematools.__version__,
+        bids_version=validation_result["bids_version"],
     )
 
     # Storing variable to not re-compute set paths for each individual file.
@@ -120,7 +121,6 @@ def validate_bids(
     for meta in validation_result["match_listing"]:
         file_path = meta.pop("path")
         meta = {BIDS_TO_DANDI[k]: v for k, v in meta.items() if k in BIDS_TO_DANDI}
-        meta["bids_schema_version"] = validation_result["bids_version"]
         if parent_path != os.path.dirname(file_path):
             parent_path = os.path.dirname(file_path)
             dataset_path = find_parent_directory_containing(

diff --git a/dandi/validate_types.py b/dandi/validate_types.py
@@ -8,6 +8,7 @@
 class ValidationOrigin:
     name: str
     version: str
+    bids_version: str
 
 
 class Severity(Enum):