Instrument Rdrc (#50)

* moves InstrumentRdrc to instrument.py

* moves deprecated message to docstring

src/aind_slims_api/models/__init__.py

@@ -4,7 +4,7 @@
 
 from aind_slims_api.models.attachment import SlimsAttachment
 from aind_slims_api.models.behavior_session import SlimsBehaviorSession
-from aind_slims_api.models.instrument import SlimsInstrument
+from aind_slims_api.models.instrument import SlimsInstrument, SlimsInstrumentRdrc
 from aind_slims_api.models.metadata import SlimsMetadataReference
 from aind_slims_api.models.mouse import SlimsMouseContent
 from aind_slims_api.models.unit import SlimsUnit
@@ -16,6 +16,7 @@
     "SlimsAttachment",
     "SlimsBehaviorSession",
     "SlimsInstrument",
+    "SlimsInstrumentRdrc",
     "SlimsMouseContent",
     "SlimsUnit",
     "SlimsUser",

src/aind_slims_api/models/ecephys_session.py

@@ -180,8 +180,8 @@ class SlimsStimulusEpochsResult(SlimsBaseModel):
     )
     stimulus_name: Optional[str] = Field(
         default=None,
-        serialization_alias="rslt_cf_stimulusDeviceNames",
-        validation_alias="rslt_cf_stimulusDeviceNames",
+        serialization_alias="rslt_cf_stimulusName",
+        validation_alias="rslt_cf_stimulusName",
     )
     stimulus_modalities: Optional[List] = Field(
         default=None,
@@ -378,26 +378,6 @@ class SlimsEphysInsertionResult(SlimsBaseModel):
     }
 
 
-class SlimsInstrumentRdrc(SlimsBaseModel):
-    """Model for Instrument Rdrc"""
-
-    pk: Optional[int] = Field(
-        default=None, serialization_alias="rdrc_pk", validation_alias="rdrc_pk"
-    )
-    name: Optional[str] = Field(
-        default=None, serialization_alias="rdrc_name", validation_alias="rdrc_name"
-    )
-    created_on: Optional[datetime] = Field(
-        default=None,
-        serialization_alias="rdrc_createdOn",
-        validation_alias="rdrc_createdOn",
-    )
-    _slims_table = "ReferenceDataRecord"
-    _base_fetch_filters: ClassVar[dict[str, str]] = {
-        "rdty_name": "AIND Instruments",
-    }
-
-
 class SlimsDomeModuleRdrc(SlimsBaseModel):
     """Model for Dome Module Reference Data"""
 

src/aind_slims_api/models/instrument.py

@@ -1,16 +1,36 @@
 """Contains a model for the instrument content, and a method for fetching it"""
 
 from datetime import datetime
-from typing import Optional
+from typing import Optional, ClassVar
 
 from pydantic import Field
 
 from aind_slims_api.models.base import SlimsBaseModel
 
 
+class SlimsInstrumentRdrc(SlimsBaseModel):
+    """Model for Instrument Rdrc"""
+
+    pk: Optional[int] = Field(
+        default=None, serialization_alias="rdrc_pk", validation_alias="rdrc_pk"
+    )
+    name: Optional[str] = Field(
+        default=None, serialization_alias="rdrc_name", validation_alias="rdrc_name"
+    )
+    created_on: Optional[datetime] = Field(
+        default=None,
+        serialization_alias="rdrc_createdOn",
+        validation_alias="rdrc_createdOn",
+    )
+    _slims_table = "ReferenceDataRecord"
+    _base_fetch_filters: ClassVar[dict[str, str]] = {
+        "rdty_name": "AIND Instruments",
+    }
+
+
 class SlimsInstrument(SlimsBaseModel):
     """Model for a SLIMS instrument record.
-
+    This model may be deprecated. Use SlimsInstrumentRdrc for newer instruments.
     Examples
     --------
     >>> from aind_slims_api.core import SlimsClient

src/aind_slims_api/operations/ecephys_session.py

@@ -21,8 +21,8 @@
     SlimsGroupOfSessionsRunStep,
     SlimsMouseSessionRunStep,
     SlimsBrainStructureRdrc,
-    SlimsInstrumentRdrc,
 )
+from aind_slims_api.models import SlimsInstrumentRdrc
 
 logger = logging.getLogger(__name__)
 

tests/test_operations/test_ecephys_session.py

@@ -19,8 +19,8 @@
     SlimsExperimentRunStepContent,
     SlimsExperimentRunStep,
     SlimsBrainStructureRdrc,
-    SlimsInstrumentRdrc,
 )
+from aind_slims_api.models.instrument import SlimsInstrumentRdrc
 from aind_slims_api.operations import EcephysSession, fetch_ecephys_sessions
 from aind_slims_api.operations.ecephys_session import EcephysSessionBuilder