add accessServiceCategory

HDRUK · Feb 26, 2024 · 3ede6c1 · 3ede6c1
1 parent e20d725
commit 3ede6c1
Show file tree

Hide file tree

Showing 9 changed files with 396 additions and 714 deletions.
diff --git a/docs/GWDM/1.2.md b/docs/GWDM/1.2.md
@@ -681,6 +681,17 @@ Name of the data processors
 
 
 
+#### accessServiceCategory
+
+Where access to data come from: TRE/SED, direct access, open acccess, varies based on project.
+
+| title                           | is_list   | is_optional   | required   | type                                                                                                      |
+|:--------------------------------|:----------|:--------------|:-----------|:----------------------------------------------------------------------------------------------------------|
+| Access/governance requirementss | False     | True          | False      | ["CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]", 'null'] |
+
+
+
+
 ### formatAndStandards
 
 Section includes technical attributes for language vocabularies, sizes etc. and gives researchers facts about and processing the underlying data in the dataset.

diff --git a/docs/GWDM/1.2.structure.json b/docs/GWDM/1.2.structure.json
@@ -871,6 +871,20 @@
                                     "is_list": false,
                                     "is_optional": true,
                                     "subItems": []
+                              },
+                              {
+                                    "name": "accessServiceCategory",
+                                    "required": false,
+                                    "title": "Access/governance requirementss",
+                                    "description": "Where access to data come from: TRE/SED, direct access, open acccess, varies based on project.",
+                                    "examples": null,
+                                    "type": [
+                                          "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
+                                          "null"
+                                    ],
+                                    "is_list": false,
+                                    "is_optional": true,
+                                    "subItems": []
                               }
                         ]
                   },

diff --git a/docs/HDRUK/2.2.1.md b/docs/HDRUK/2.2.1.md
diff --git a/docs/HDRUK/2.2.1.structure.json b/docs/HDRUK/2.2.1.structure.json
diff --git a/hdr_schemata/models/GWDM/1.2/schema.json b/hdr_schemata/models/GWDM/1.2/schema.json
@@ -110,6 +110,20 @@
                               "description": "Name of the data processors",
                               "example": "SAIL Databank",
                               "title": "Data Processor"
+                        },
+                        "accessServiceCategory": {
+                              "anyOf": [
+                                    {
+                                          "$ref": "#/$defs/CommaSeparatedValues"
+                                    },
+                                    {
+                                          "type": "null"
+                                    }
+                              ],
+                              "default": null,
+                              "description": "Where access to data come from: TRE/SED, direct access, open acccess, varies based on project.",
+                              "example": "",
+                              "title": "Access/governance requirementss"
                         }
                   },
                   "required": [

diff --git a/hdr_schemata/models/GWDM/v1_2/Access.py b/hdr_schemata/models/GWDM/v1_2/Access.py
@@ -2,12 +2,11 @@
 from pydantic import Field
 from hdr_schemata.definitions.HDRUK import CommaSeparatedValues
 
-
 from hdr_schemata.models.GWDM.v1_1 import Access as BaseAccess
 
 
 class Access(BaseAccess):
-    accessServiceCategory = Optional[CommaSeparatedValues] = Field(
+    accessServiceCategory: Optional[CommaSeparatedValues] = Field(
         None,
         description="Where access to data come from: TRE/SED, direct access, open acccess, varies based on project.",
         example="",

diff --git a/hdr_schemata/models/HDRUK/2.2.1/schema.json b/hdr_schemata/models/HDRUK/2.2.1/schema.json
diff --git a/hdr_schemata/models/HDRUK/v2_2_1/Access.py b/hdr_schemata/models/HDRUK/v2_2_1/Access.py
@@ -6,7 +6,7 @@
 
 
 class Access(BaseAccess):
-    accessServiceCategory = Optional[List[AccessService]] = Field(
+    accessServiceCategory: Optional[List[AccessService]] = Field(
         None,
         description="Where access to data come from: TRE/SED, direct access, open acccess, varies based on project.",
         example="",

diff --git a/hdr_schemata/models/HDRUK/v2_2_1/Accessibility.py b/hdr_schemata/models/HDRUK/v2_2_1/Accessibility.py
@@ -1,27 +1,13 @@
-from typing import Optional
-from pydantic import BaseModel, Field
+from pydantic import Field
 from hdr_schemata.definitions.HDRUK import *
 
-from .Usage import Usage
+from hdr_schemata.models.GWDM.v1_1 import Accessibility as BaseAccessibility
 from .Access import Access
-from .FormatAndStandards import FormatAndStandards
 
-class Accessibility(BaseModel):
-    class Config:
-        extra = 'forbid'
 
-    usage: Optional[Usage] = Field(
-        None,
-        description='This section includes information about how the data can be used and how it is currently being used',
-        title='Usage',
-    )
+class Accessibility(BaseAccessibility):
     access: Access = Field(
         ...,
-        description='This section includes information about data access',
-        title='Access',
-    )
-    formatAndStandards: Optional[FormatAndStandards] = Field(
-        None,
-        description='Section includes technical attributes for language vocabularies, sizes etc. and gives researchers facts about and processing the underlying data in the dataset.',
-        title='Format and Standards',
+        description="This section includes information about data access",
+        title="Access",
     )