From 51fee52a3bddb77e5cfcad977e585fdf47b48ea8 Mon Sep 17 00:00:00 2001
From: Seyed Yahya Shirazi <shirazi@ieee.org>
Date: Mon, 6 May 2024 10:17:35 -0700
Subject: [PATCH 1/3] Add stimulus and annotation entities

---
 src/schema/objects/entities.yaml | 19 +++++++++++++++++++
 src/schema/rules/entities.yaml   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/src/schema/objects/entities.yaml b/src/schema/objects/entities.yaml
index 6facc34c0d..bab521a271 100644
--- a/src/schema/objects/entities.yaml
+++ b/src/schema/objects/entities.yaml
@@ -422,3 +422,22 @@ tracksys:
     may be longer and more human readable.
   type: string
   format: label
+stimulus:
+  name: stim
+  display_name: Stimulus
+  description: |
+    The `stim-<label>` entity can be used to distinguish stimulus files stored in the `stimuli/` directory.
+
+    This entity is only applicable to stimulus files.
+  type: string
+  format: label
+annotation:
+  name: annot
+  display_name: Annotation
+  description: |
+    The `annot-<label>` entity can be used to distinguish different annotations
+    of the stimlus data.
+
+    This entity is only applicable to stimulus files.
+  type: string
+  format: label
diff --git a/src/schema/rules/entities.yaml b/src/schema/rules/entities.yaml
index 2194a61a92..8d86c87d9e 100644
--- a/src/schema/rules/entities.yaml
+++ b/src/schema/rules/entities.yaml
@@ -30,3 +30,5 @@
 - density
 - label
 - description
+- stimulus
+- annotation

From cee030184866934317f8364ccb116a805614de0f Mon Sep 17 00:00:00 2001
From: Seyed Yahya Shirazi <shirazi@ieee.org>
Date: Mon, 6 May 2024 11:23:50 -0700
Subject: [PATCH 2/3] Add stim_id field to columns.yaml

---
 src/schema/objects/columns.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/schema/objects/columns.yaml b/src/schema/objects/columns.yaml
index 5ca387a007..0bcec1bcc4 100644
--- a/src/schema/objects/columns.yaml
+++ b/src/schema/objects/columns.yaml
@@ -603,6 +603,14 @@ stim_file:
     For example `images/cat03.jpg` will be translated to `/stimuli/images/cat03.jpg`.
   type: string
   format: stimuli_relative
+stim_id:
+  name: stim_id
+  display_name: Stimulus ID
+  description: |
+    A stimulus identifier of the form `stim-<label>`,
+    matching a stimulus entity found in `stimuli/` directory.
+  type: string
+  pattern: ^stim-[0-9a-zA-Z]+$
 strain:
   name: strain
   display_name: Strain

From 2bc513d54b02fbd0b09b95c1df7f9802fd9ebe98 Mon Sep 17 00:00:00 2001
From: "Seyed (Yahya) Shirazi" <shirazi@ieee.org>
Date: Mon, 5 Aug 2024 22:09:07 -0700
Subject: [PATCH 3/3] Correct typo in entities.yaml

---
 src/schema/objects/entities.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/schema/objects/entities.yaml b/src/schema/objects/entities.yaml
index bab521a271..adfdaf533c 100644
--- a/src/schema/objects/entities.yaml
+++ b/src/schema/objects/entities.yaml
@@ -436,7 +436,7 @@ annotation:
   display_name: Annotation
   description: |
     The `annot-<label>` entity can be used to distinguish different annotations
-    of the stimlus data.
+    of the stimulus data.
 
     This entity is only applicable to stimulus files.
   type: string