Merge pull request #35 from kushalbakshi/main

Fix `AttributeError` in NWB export for `session_with_id`

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
+## [0.1.6] - 2023-09-18
+
++ Update - NWB export checks for activated session schema to allow use of both
+  `session_with_id` and `session_with_datetime`
+
+
 ## [0.1.5] - 2023-06-20
 
 + Update - GitHub Actions workflows
@@ -39,6 +45,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
 + Add - GitHub Action release process
 + Add - `session` schema
 
+[0.1.6]: https://github.com/datajoint/element-session/releases/tag/0.1.6
 [0.1.5]: https://github.com/datajoint/element-session/releases/tag/0.1.5
 [0.1.4]: https://github.com/datajoint/element-session/releases/tag/0.1.4
 [0.1.3]: https://github.com/datajoint/element-session/releases/tag/0.1.3

element_session/export/nwb.py

@@ -1,8 +1,16 @@
 import datetime
 from uuid import uuid4
 import pynwb
+import datajoint as dj
 
-from .. import session
+from .. import session_with_id, session_with_datetime
+
+if session_with_datetime.schema.is_activated():
+    session = session_with_datetime
+elif session_with_id.schema.is_activated():
+    session = session_with_id
+else:
+    raise dj.DataJointError("Session schema has not been activated.")
 
 
 def session_to_nwb(
@@ -12,7 +20,7 @@ def session_to_nwb(
     protocol_key: dict = None,
     additional_nwbfile_kwargs=None,
 ) -> pynwb.NWBFile:
-    """Return subject and session metadata ass NWBFile object
+    """Return subject and session metadata as NWBFile object
 
     Gather session- and subject-level metadata and use it to create an NWBFile. If there
     is no subject_to_nwb export function in the current namespace, subject_id will be
@@ -58,7 +66,7 @@ def session_to_nwb(
     session_key = (session.Session & session_key).fetch1("KEY")
 
     session_identifier = {
-        k: v.isoformat() if isinstance(v, datetime.datetime) else v
+        k: v.isoformat() if isinstance(v, datetime.datetime) else str(v)
         for k, v in session_key.items()
     }
 

element_session/version.py

@@ -1,2 +1,2 @@
 """Package metadata."""
-__version__ = "0.1.5"
+__version__ = "0.1.6"