adding Reader to contributor types

Signed-off-by: Neal Ensor <ensorn@osti.gov>

Author: nensor

src/elinkapi/contribution.py

@@ -0,0 +1,31 @@
+from enum import Enum
+
+class Contribution(Enum):
+    Chair="Chair"
+    ContactPerson="ContactPerson"
+    DataCollector="DataCollector"
+    DataCurator="DataCurator"
+    DataManager="DataManager"
+    Distributor="Distributor"
+    Editor="Editor"
+    HostingInstitution="HostingInstitution"
+    Producer="Producer"
+    ProjectLeader="ProjectLeader"
+    ProjectManager="ProjectManager"
+    ProjectMember="ProjectMember"
+    Reader="Reader"
+    RegistrationAgency="RegistrationAgency"
+    RegistrationAuthority="RegistrationAuthority"
+    RelatedPerson="RelatedPerson"
+    Researcher="Researcher"
+    ResearchGroup="ResearchGroup"
+    Reviewer="Reviewer"
+    ReviewerExternal="review-external"
+    ReviewAssistant="review-assistant"
+    RightsHolder="RightsHolder"
+    Sponsor="Sponsor"
+    StatsViewer="stats-reviewer"
+    Supervisor="Supervisor"
+    Translator="Translator"
+    WorkPackageLeader="WorkPackageLeader"
+    Other="Other"

src/elinkapi/organization.py

@@ -3,6 +3,7 @@
 from pydantic import BaseModel, ConfigDict, field_validator, model_validator
 from typing import List
 from .utils import Validation
+from .contribution import Contribution
 
 class Organization(BaseModel):
     model_config = ConfigDict(validate_assignment=True)
@@ -14,27 +15,6 @@ class Type(Enum):
         SPONSOR="SPONSOR"
         PAMS_TD_INST="PAMS_TD_INST"
 
-    class Contribution(Enum):
-        DataCollector="DataCollector"
-        DataCurator="DataCurator"
-        DataManager="DataManager"
-        Distributor="Distributor"
-        Editor="Editor"
-        HostingInstitution="HostingInstitution"
-        Producer="Producer"
-        ProjectLeader="ProjectLeader"
-        ProjectManager="ProjectManager"
-        ProjectMember="ProjectMember"
-        RegistrationAgency="RegistrationAgency"
-        RegistrationAuthority="RegistrationAuthority"
-        Researcher="Researcher"
-        ResearchGroup="ResearchGroup"
-        RightsHolder="RightsHolder"
-        Sponsor="Sponsor"
-        Supervisor="Supervisor"
-        WorkPackageLeader="WorkPackageLeader"
-        Other="Other"
-
     type:str
     name:str = None
     contributor_type: str = None
@@ -57,7 +37,7 @@ def type_must_be_valid(cls, value: str) -> str:
     @field_validator("contributor_type")
     @classmethod
     def contributor_must_be_valid(cls, value: str) -> str:
-        if value not in [type.value for type in cls.Contribution]:
+        if value not in [type.value for type in Contribution]:
             raise ValueError("Unknown contribution type {}.".format(value))
         return value
 

src/elinkapi/person.py

@@ -2,6 +2,7 @@
 from pydantic import BaseModel, ConfigDict, field_validator
 from typing import List
 from .affiliation import Affiliation
+from .contribution import Contribution
 
 class Person(BaseModel):
     model_config = ConfigDict(validate_assignment=True)
@@ -15,30 +16,7 @@ class Type(Enum):
         RELEASE="RELEASE"
         BUSINESS_OFFICIAL="SBIZ_BO"
         PRINCIPAL_INVESTIGATOR="SBIZ_PI"
-    class Contribution(Enum):
-        Chair="Chair"
-        Reader="Reader"
-        Reviewer="Reviewer"
-        ReviewAssistant="ReviewAssistant"
-        ReviewerExternal="ReviewerExternal"
-        StatsReviewer="StatsReviewer"
-        Translator="Translator"
-        DataCollector="DataCollector"
-        DataCurator="DataCurator"
-        DataManager="DataManager"
-        Distributor="Distributor"
-        Editor="Editor"
-        Producer="Producer"
-        ProjectLeader="ProjectLeader"
-        ProjectManager="ProjectManager"
-        ProjectMember="ProjectMember"
-        RelatedPerson="RelatedPerson"
-        Researcher="Researcher"
-        RightsHolder="RightsHolder"
-        Supervisor="Supervisor"
-        WorkPackageLeader="WorkPackageLeader"
-        Other="Other"
-
+        
     type: str
     first_name: str = None
     middle_name: str = None
@@ -59,7 +37,7 @@ def type_must_be_valid(cls, value) -> str:
     @field_validator("contributor_type")
     @classmethod
     def contributor_must_be_valid(cls, value) -> str:
-        if value not in [type.value for type in cls.Contribution]:
+        if value not in [type.value for type in Contribution]:
             raise ValueError('Unknown contributor type value {}.'.format(value))
         return value