zombie-squirrel 0.4.7__tar.gz → 0.5.1__tar.gz

{zombie_squirrel-0.4.7/src/zombie_squirrel.egg-info → zombie_squirrel-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zombie-squirrel
-Version: 0.4.7
+Version: 0.5.1
 Summary: Generated from aind-library-template
 Author: Allen Institute for Neural Dynamics
 License: MIT
@@ -17,7 +17,7 @@ Dynamic: license-file
 ![Code Style](https://img.shields.io/badge/code%20style-black-black)
 [![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
 ![Interrogate](https://img.shields.io/badge/interrogate-100.0%25-brightgreen)
-![Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen)
+![Coverage](https://img.shields.io/badge/coverage-99%25-brightgreen)
 ![Python](https://img.shields.io/badge/python->=3.10-blue?logo=python)
 
 <img src="zombie-squirrel_logo.png" width="400" alt="Logo (image from ChatGPT)">

{zombie_squirrel-0.4.7 → zombie_squirrel-0.5.1}/README.md

@@ -4,7 +4,7 @@
 ![Code Style](https://img.shields.io/badge/code%20style-black-black)
 [![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
 ![Interrogate](https://img.shields.io/badge/interrogate-100.0%25-brightgreen)
-![Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen)
+![Coverage](https://img.shields.io/badge/coverage-99%25-brightgreen)
 ![Python](https://img.shields.io/badge/python->=3.10-blue?logo=python)
 
 <img src="zombie-squirrel_logo.png" width="400" alt="Logo (image from ChatGPT)">

{zombie_squirrel-0.4.7 → zombie_squirrel-0.5.1}/src/zombie_squirrel/__init__.py

@@ -3,7 +3,7 @@
 Provides functions to fetch and cache project names, subject IDs, and asset
 metadata from the AIND metadata database with support for multiple backends."""
 
-__version__ = "0.4.7"
+__version__ = "0.5.1"
 
 from zombie_squirrel.squirrels import (  # noqa: F401
     asset_basics,

{zombie_squirrel-0.4.7 → zombie_squirrel-0.5.1}/src/zombie_squirrel/squirrels.py

@@ -143,6 +143,9 @@ def asset_basics(force_update: bool = False) -> pd.DataFrame:
         "subject.subject_id",
         "acquisition.acquisition_start_time",
         "acquisition.acquisition_end_time",
+        "processing.data_processes.start_date_time",
+        "subject.subject_details.genotype",
+        "location",
     ]
 
     if df.empty or force_update:
@@ -157,6 +160,9 @@ def asset_basics(force_update: bool = False) -> pd.DataFrame:
                 "subject_id",
                 "acquisition_start_time",
                 "acquisition_end_time",
+                "process_date",
+                "genotype",
+                "location",
             ]
         )
         client = MetadataDbClient(
@@ -183,7 +189,7 @@ def asset_basics(force_update: bool = False) -> pd.DataFrame:
         asset_records = []
         for i in range(0, len(keep_ids), BATCH_SIZE):
             logging.info(f"Fetching asset basics batch {i // BATCH_SIZE + 1}...")
-            batch_ids = keep_ids[i : i + BATCH_SIZE]
+            batch_ids = keep_ids[i: i + BATCH_SIZE]
             batch_records = client.retrieve_docdb_records(
                 filter_query={"_id": {"$in": batch_ids}},
                 projection={field: 1 for field in FIELDS + ["_id", "_last_modified"]},
@@ -197,6 +203,16 @@ def asset_basics(force_update: bool = False) -> pd.DataFrame:
             modalities = record.get("data_description", {}).get("modalities", [])
             modality_abbreviations = [modality["abbreviation"] for modality in modalities if "abbreviation" in modality]
             modality_abbreviations_str = ", ".join(modality_abbreviations)
+
+            # Get the process date, convert to YYYY-MM-DD if present
+            data_processes = record.get("processing", {}).get("data_processes", [])
+            if data_processes:
+                latest_process = data_processes[-1]
+                process_datetime = latest_process.get("start_date_time", None)
+                process_date = process_datetime.split("T")[0]
+            else:
+                process_date = None
+
             flat_record = {
                 "_id": record["_id"],
                 "_last_modified": record.get("_last_modified", None),
@@ -206,6 +222,9 @@ def asset_basics(force_update: bool = False) -> pd.DataFrame:
                 "subject_id": record.get("subject", {}).get("subject_id", None),
                 "acquisition_start_time": record.get("acquisition", {}).get("acquisition_start_time", None),
                 "acquisition_end_time": record.get("acquisition", {}).get("acquisition_end_time", None),
+                "process_date": process_date,
+                "genotype": record.get("subject", {}).get("subject_details", {}).get("genotype", None),
+                "location": record.get("location", None),
             }
             records.append(flat_record)
 
@@ -300,6 +319,8 @@ def raw_to_derived(force_update: bool = False) -> pd.DataFrame:
         raw_to_derived_map = {raw_id: [] for raw_id in raw_ids}
         for derived_record in derived_records:
             source_data_list = derived_record.get("data_description", {}).get("source_data", [])
+            if not source_data_list:
+                continue
             derived_id = derived_record["_id"]
             # Add this derived record to each raw record it depends on
             for source_id in source_data_list:

{zombie_squirrel-0.4.7 → zombie_squirrel-0.5.1/src/zombie_squirrel.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zombie-squirrel
-Version: 0.4.7
+Version: 0.5.1
 Summary: Generated from aind-library-template
 Author: Allen Institute for Neural Dynamics
 License: MIT
@@ -17,7 +17,7 @@ Dynamic: license-file
 ![Code Style](https://img.shields.io/badge/code%20style-black-black)
 [![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
 ![Interrogate](https://img.shields.io/badge/interrogate-100.0%25-brightgreen)
-![Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen)
+![Coverage](https://img.shields.io/badge/coverage-99%25-brightgreen)
 ![Python](https://img.shields.io/badge/python->=3.10-blue?logo=python)
 
 <img src="zombie-squirrel_logo.png" width="400" alt="Logo (image from ChatGPT)">