diff --git a/excel_sheets/Document_metadata.xlsx b/excel_sheets/Document_metadata.xlsx index fc3b5bb..1a3ed03 100644 Binary files a/excel_sheets/Document_metadata.xlsx and b/excel_sheets/Document_metadata.xlsx differ diff --git a/excel_sheets/Image_metadata.xlsx b/excel_sheets/Image_metadata.xlsx index a9c67e3..ec1fa1a 100644 Binary files a/excel_sheets/Image_metadata.xlsx and b/excel_sheets/Image_metadata.xlsx differ diff --git a/excel_sheets/Table_metadata.xlsx b/excel_sheets/Table_metadata.xlsx index 3fbb790..4ba7657 100644 Binary files a/excel_sheets/Table_metadata.xlsx and b/excel_sheets/Table_metadata.xlsx differ diff --git a/pydantic_schemas/indicator_schema.py b/pydantic_schemas/indicator_schema.py index 74b231f..5a2201c 100644 --- a/pydantic_schemas/indicator_schema.py +++ b/pydantic_schemas/indicator_schema.py @@ -65,10 +65,10 @@ class AuthoringEntityItem(SchemaBaseModel): title="Agency Name", ) affiliation: Optional[str] = Field(None, title="Affiliation") - abbreviation: Optional[Any] = Field( + abbreviation: Optional[str] = Field( None, description="Abbreviation", title="Abbreviation" ) - email: Optional[Any] = Field(None, description="Email", title="Email") + email: Optional[str] = Field(None, description="Email", title="Email") uri: Optional[str] = Field(None, title="URI") diff --git a/pydantic_schemas/table_schema.py b/pydantic_schemas/table_schema.py index 7bbb3fa..56d34d5 100644 --- a/pydantic_schemas/table_schema.py +++ b/pydantic_schemas/table_schema.py @@ -370,10 +370,10 @@ class ProvenanceSchema(SchemaBaseModel): class AuthorIdItem(SchemaBaseModel): - type: Optional[Any] = Field( + type: Optional[str] = Field( None, description="Source of identifier, e.g. ORCID", title="Type" ) - id: Optional[Any] = Field( + id: Optional[str] = Field( None, description="Author's unique identifier for the corresponding source", title="Identifier", diff --git a/pydantic_schemas/utils/quick_start.py b/pydantic_schemas/utils/quick_start.py index f1b82df..f893288 100644 --- a/pydantic_schemas/utils/quick_start.py +++ b/pydantic_schemas/utils/quick_start.py @@ -7,7 +7,7 @@ from .utils import standardize_keys_in_dict -DEFAULT_URL = "http://www.example.com" +DEFAULT_URL = "https://www.example.com" MAX_DEPTH = 12 diff --git a/schemas/table-schema.json b/schemas/table-schema.json index ae532a4..71a5250 100644 --- a/schemas/table-schema.json +++ b/schemas/table-schema.json @@ -36,11 +36,13 @@ "properties": { "type": { "title": "Type", - "description": "Source of identifier, e.g. ORCID" + "description": "Source of identifier, e.g. ORCID", + "type": "string" }, "id": { "title": "Identifier", - "description": "Author's unique identifier for the corresponding source" + "description": "Author's unique identifier for the corresponding source", + "type": "string" } } } diff --git a/schemas/timeseries-schema.json b/schemas/timeseries-schema.json index 7c9dd48..96fc2eb 100644 --- a/schemas/timeseries-schema.json +++ b/schemas/timeseries-schema.json @@ -127,11 +127,13 @@ }, "abbreviation": { "title": "Abbreviation", - "description": "Abbreviation" + "description": "Abbreviation", + "type": "string" }, "email": { "title": "Email", - "description": "Email" + "description": "Email", + "type": "string" }, "uri": { "title": "URI",