Consistency and style tweaks

model/administration_duration.py

@@ -3,8 +3,8 @@
 from typing import Literal
 
 class AdministrationDuration(ApiBaseModelWithId):
-	quantity:	Quantity
-	description: str
-	durationWillVary: bool
-	reasonDurationWillVary:	str
-	instanceType: Literal['AdministrationDuration'] = 'AdministrationDuration'
+  quantity:	Quantity
+  description: str
+  durationWillVary: bool
+  reasonDurationWillVary:	str
+  instanceType: Literal['AdministrationDuration'] = 'AdministrationDuration'

model/agent_administration.py

@@ -5,8 +5,8 @@
 from typing import Literal
 
 class AgentAdministration(ApiBaseModelWithIdNameLabelAndDesc):
-	duration:	AdministrationDuration
-	dose:	Quantity
-	route:	Code
-	frequency:	Code
-	instanceType: Literal['AgentAdministration'] = 'AgentAdministration'
+  duration:	AdministrationDuration
+  dose:	Quantity
+  route:	Code
+  frequency:	Code
+  instanceType: Literal['AgentAdministration'] = 'AgentAdministration'

model/biomedical_concept.py

@@ -8,4 +8,4 @@ class BiomedicalConcept(ApiBaseModelWithIdNameAndLabel):
   reference: str
   properties: List[BiomedicalConceptProperty] = []
   code: AliasCode
-  instanceType: Literal['BiomedicalConcept'] = 'BiomedicalConcept'
+  instanceType: Literal['BiomedicalConcept'] = 'BiomedicalConcept'

model/characteristic.py

@@ -2,4 +2,4 @@
 from .syntax_template import SyntaxTemplate
 
 class Characteristic(SyntaxTemplate):
-  instanceType: Literal['Characteristic'] = 'Characteristic'
+  instanceType: Literal['Characteristic'] = 'Characteristic'

model/code.py

@@ -1,5 +1,5 @@
-from .api_base_model import ApiBaseModelWithId
 from typing import Literal
+from .api_base_model import ApiBaseModelWithId
 
 class Code(ApiBaseModelWithId):
   code: str

model/eligibility_criteria.py

@@ -8,4 +8,4 @@ class EligibilityCriteria(SyntaxTemplate):
   nextId: Union[str, None] = None
   previousId: Union[str, None] = None
   contextId: Union[str, None] = None
-  instanceType: Literal['EligibilityCriteria'] = 'EligibilityCriteria'
+  instanceType: Literal['EligibilityCriteria'] = 'EligibilityCriteria'

model/encounter.py

@@ -12,4 +12,4 @@ class Encounter(ApiBaseModelWithIdNameLabelAndDesc):
   contactModes: List[Code] = []
   transitionStartRule: Union[TransitionRule, None] = None
   transitionEndRule: Union[TransitionRule, None] = None
-  instanceType: Literal['Encounter'] = 'Encounter'
+  instanceType: Literal['Encounter'] = 'Encounter'

model/geographic_scope.py

@@ -6,8 +6,8 @@
 class GeographicScope(ApiBaseModelWithId):
   type: Code
   code: Union[AliasCode, None] = None
-  instanceType: Literal['GeographicScope']
+  instanceType: Literal['GeographicScope'] = 'GeographicScope'
 
 class SubjectEnrollment(GeographicScope):
   quantity: str
-  instanceType: Literal['SubjectEnrollment'] = 'SubjectEnrollment'
+  instanceType: Literal['SubjectEnrollment'] = 'SubjectEnrollment'

model/intercurrent_event.py

@@ -1,6 +1,6 @@
-from .api_base_model import ApiBaseModelWithIdNameLabelAndDesc
 from typing import Literal
+from .api_base_model import ApiBaseModelWithIdNameLabelAndDesc
 
 class IntercurrentEvent(ApiBaseModelWithIdNameLabelAndDesc):
   strategy: str
-  instanceType: Literal['IntercurrentEvent'] = 'IntercurrentEvent'
+  instanceType: Literal['IntercurrentEvent'] = 'IntercurrentEvent'

model/objective.py

@@ -6,4 +6,4 @@
 class Objective(SyntaxTemplate):
   level: Union[Code, None] = None
   endpoints: List[Endpoint] = []
-  instanceType: Literal['Objective'] = 'Objective'
+  instanceType: Literal['Objective'] = 'Objective'

model/response_code.py

@@ -1,6 +1,6 @@
+from typing import Literal
 from .api_base_model import ApiBaseModelWithId
 from .code import Code
-from typing import Literal
 
 class ResponseCode(ApiBaseModelWithId):
   isEnabled: bool

model/study_amendment.py

@@ -11,4 +11,4 @@ class StudyAmendment(ApiBaseModelWithId):
   secondaryReasons: List[StudyAmendmentReason] = []
   enrollments: List[SubjectEnrollment]
   previousId: Union[str, None] = None
-  instanceType: Literal['StudyAmendment'] = 'StudyAmendment'
+  instanceType: Literal['StudyAmendment'] = 'StudyAmendment'

model/study_design.py

@@ -53,4 +53,4 @@ class StudyDesign(ApiBaseModelWithIdNameLabelAndDesc):
   dictionaries: List[SyntaxTemplateDictionary] = []
   conditions: List[Condition] = []
   organizations: List[ResearchOrganization] = []
-  instanceType: Literal['StudyDesign'] = 'StudyDesign'
+  instanceType: Literal['StudyDesign'] = 'StudyDesign'

model/study_identifier.py

@@ -1,8 +1,8 @@
+from typing import Literal
 from .api_base_model import ApiBaseModelWithId
 from .organization import Organization
-from typing import Literal
 
 class StudyIdentifier(ApiBaseModelWithId):
   studyIdentifier: str
   studyIdentifierScope: Organization
-  instanceType: Literal['StudyIdentifier'] = 'StudyIdentifier'
+  instanceType: Literal['StudyIdentifier'] = 'StudyIdentifier'

model/syntax_template.py

@@ -4,4 +4,4 @@
 class SyntaxTemplate(ApiBaseModelWithIdNameLabelAndDesc):
   text: str
   dictionaryId: Union[str, None] = None
-  instanceType: Literal['SyntaxTemplate'] = 'SyntaxTemplate'
+  instanceType: Literal['SyntaxTemplate'] = 'SyntaxTemplate'

model/transition_rule.py

@@ -3,4 +3,4 @@
 
 class TransitionRule(ApiBaseModelWithIdNameLabelAndDesc):
   text: str
-  instanceType: Literal['TransitionRule'] = 'TransitionRule'
+  instanceType: Literal['TransitionRule'] = 'TransitionRule'