diff --git a/excel_sheets/Document_metadata.xlsx b/excel_sheets/Document_metadata.xlsx index 4a357c7..d5237aa 100644 Binary files a/excel_sheets/Document_metadata.xlsx and b/excel_sheets/Document_metadata.xlsx differ diff --git a/excel_sheets/Indicator_metadata.xlsx b/excel_sheets/Indicator_metadata.xlsx index 3131f10..3fcbb68 100644 Binary files a/excel_sheets/Indicator_metadata.xlsx and b/excel_sheets/Indicator_metadata.xlsx differ diff --git a/excel_sheets/Indicators_db_metadata.xlsx b/excel_sheets/Indicators_db_metadata.xlsx index 91d092f..9f2d6b8 100644 Binary files a/excel_sheets/Indicators_db_metadata.xlsx and b/excel_sheets/Indicators_db_metadata.xlsx differ diff --git a/excel_sheets/Microdata_metadata.xlsx b/excel_sheets/Microdata_metadata.xlsx index 422ac66..173a2fd 100644 Binary files a/excel_sheets/Microdata_metadata.xlsx and b/excel_sheets/Microdata_metadata.xlsx differ diff --git a/excel_sheets/Resource_metadata.xlsx b/excel_sheets/Resource_metadata.xlsx index 65bd3f3..0aa789a 100644 Binary files a/excel_sheets/Resource_metadata.xlsx and b/excel_sheets/Resource_metadata.xlsx differ diff --git a/excel_sheets/Script_metadata.xlsx b/excel_sheets/Script_metadata.xlsx index a08a0c7..6029541 100644 Binary files a/excel_sheets/Script_metadata.xlsx and b/excel_sheets/Script_metadata.xlsx differ diff --git a/excel_sheets/Table_metadata.xlsx b/excel_sheets/Table_metadata.xlsx index d0e32ec..04da647 100644 Binary files a/excel_sheets/Table_metadata.xlsx and b/excel_sheets/Table_metadata.xlsx differ diff --git a/excel_sheets/Video_metadata.xlsx b/excel_sheets/Video_metadata.xlsx index ebfc6a5..6a85ec7 100644 Binary files a/excel_sheets/Video_metadata.xlsx and b/excel_sheets/Video_metadata.xlsx differ diff --git a/pydantic_schemas/document_schema.py b/pydantic_schemas/document_schema.py index 4a4dad3..ba3c89f 100644 --- a/pydantic_schemas/document_schema.py +++ b/pydantic_schemas/document_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: document-schema.json -# timestamp: 2024-09-13T18:34:42+00:00 +# timestamp: 2024-09-13T19:00:20+00:00 from __future__ import annotations @@ -12,15 +12,6 @@ from .utils.schema_base_model import SchemaBaseModel -class Overwrite(Enum): - """ - Overwrite document if already exists? - """ - - yes = "yes" - no = "no" - - class Producer(SchemaBaseModel): name: Optional[str] = Field(None, description="Name (required)", title="Name") abbr: Optional[str] = Field(None, title="Abbreviation") @@ -336,7 +327,7 @@ class ProvenanceSchema(SchemaBaseModel): origin_description: Optional[OriginDescription] = Field(None, title="Origin description") -class Keyword(SchemaBaseModel): +class KeywordItem(SchemaBaseModel): name: Optional[str] = Field(None, title="Name") vocabulary: Optional[str] = Field(None, title="Vocabulary name") uri: Optional[str] = Field(None, title="Vocabulary URI") @@ -482,7 +473,7 @@ class Config: None, description="Title of a book, part of which is being cited", title="Book title" ) crossref: Optional[str] = Field( - None, description="The database key of the entry being cross referenced", title="Book title" + None, description="The database key of the entry being cross referenced", title="Cross reference" ) howpublished: Optional[str] = Field( None, @@ -506,6 +497,9 @@ class Config: url: Optional[List[str]] = Field(None, description="URL of the document, preferably a permanent URL", title="URL") translators: Optional[List[Translator]] = Field(None, description="Translators", title="Translators") contributors: Optional[List[Contributor]] = Field(None, description="Contributors", title="Contributors") + acknowledgement_statement: Optional[str] = Field( + None, description="Acknowledgement statement", title="Acknowledgement statement" + ) contacts: Optional[List[Contact]] = Field(None, description="Contacts", title="Contacts") rights: Optional[str] = Field( None, description="Information about rights held in and over the resource.", title="Rights" @@ -553,7 +547,7 @@ class Config: ), title="Data Sources", ) - keywords: Optional[List[Keyword]] = Field(None, description="Keywords", title="Keywords") + keywords: Optional[List[KeywordItem]] = Field(None, description="Keywords", title="Keywords") themes: Optional[List[Theme]] = Field(None, description="Themes") topics: Optional[List[Topic]] = Field( None, @@ -585,13 +579,7 @@ class ScriptSchemaDraft(SchemaBaseModel): Schema for Document data type """ - repositoryid: Optional[str] = Field( - None, - description="Abbreviation for the collection that owns the document", - title="Collection ID that owns the document", - ) - published: Optional[int] = Field(0, description="Status - 0=draft, 1=published", title="Status") - overwrite: Optional[Overwrite] = Field("no", description="Overwrite document if already exists?") + idno: Optional[str] = Field(None, description="Project unique identifier", title="Project unique identifier") metadata_information: Optional[MetadataInformation] = Field( None, description="Document description", title="Document metadata information" ) diff --git a/pydantic_schemas/geospatial_schema.py b/pydantic_schemas/geospatial_schema.py index 4aef392..dbe46aa 100644 --- a/pydantic_schemas/geospatial_schema.py +++ b/pydantic_schemas/geospatial_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: geospatial-schema.json -# timestamp: 2024-09-13T18:34:45+00:00 +# timestamp: 2024-09-13T19:00:22+00:00 from __future__ import annotations diff --git a/pydantic_schemas/image_schema.py b/pydantic_schemas/image_schema.py index 84362e4..24c7168 100644 --- a/pydantic_schemas/image_schema.py +++ b/pydantic_schemas/image_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: image-schema.json -# timestamp: 2024-09-13T18:34:48+00:00 +# timestamp: 2024-09-13T19:00:23+00:00 from __future__ import annotations diff --git a/pydantic_schemas/indicator_schema.py b/pydantic_schemas/indicator_schema.py index 247d78f..7ce366b 100644 --- a/pydantic_schemas/indicator_schema.py +++ b/pydantic_schemas/indicator_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: timeseries-schema.json -# timestamp: 2024-09-13T18:35:02+00:00 +# timestamp: 2024-09-13T19:00:32+00:00 from __future__ import annotations @@ -85,10 +85,17 @@ class Language(SchemaBaseModel): code: Optional[str] = Field(None, title="code") +class CodeListItem(SchemaBaseModel): + code: Optional[str] = Field(None, title="Code") + label: Optional[str] = Field(None, title="Label") + description: Optional[str] = Field(None, title="Description") + + class Dimension(SchemaBaseModel): name: Optional[str] = Field(None, title="Name") label: str = Field(..., title="Label") description: Optional[str] = Field(None, title="Description") + code_list: Optional[List[CodeListItem]] = Field(None, title="Code list") class DefinitionReference(SchemaBaseModel): @@ -569,12 +576,6 @@ class TimePeriodFormat(Enum): YYYY_MM_DDTHH_MM_SSZ = "YYYY-MM-DDTHH:MM:SSZ" -class CodeListItem(SchemaBaseModel): - code: Optional[str] = Field(None, title="Code") - label: Optional[str] = Field(None, title="Label") - description: Optional[str] = Field(None, title="Description") - - class CodeListReference(SchemaBaseModel): id: Optional[str] = Field(None, title="Identifier (ID)") name: Optional[str] = Field(None, title="Name") diff --git a/pydantic_schemas/indicators_db_schema.py b/pydantic_schemas/indicators_db_schema.py index a77eac9..67b860b 100644 --- a/pydantic_schemas/indicators_db_schema.py +++ b/pydantic_schemas/indicators_db_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: timeseries-db-schema.json -# timestamp: 2024-09-13T18:35:00+00:00 +# timestamp: 2024-09-13T19:00:30+00:00 from __future__ import annotations diff --git a/pydantic_schemas/microdata_schema.py b/pydantic_schemas/microdata_schema.py index 89469e9..2c94423 100644 --- a/pydantic_schemas/microdata_schema.py +++ b/pydantic_schemas/microdata_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: microdata-schema.json -# timestamp: 2024-09-13T18:34:51+00:00 +# timestamp: 2024-09-13T19:00:25+00:00 from __future__ import annotations diff --git a/pydantic_schemas/resource_schema.py b/pydantic_schemas/resource_schema.py index 0201c74..d72de0d 100644 --- a/pydantic_schemas/resource_schema.py +++ b/pydantic_schemas/resource_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: resource-schema.json -# timestamp: 2024-09-13T18:34:53+00:00 +# timestamp: 2024-09-13T19:00:26+00:00 from __future__ import annotations diff --git a/pydantic_schemas/script_schema.py b/pydantic_schemas/script_schema.py index c226999..f785ffe 100644 --- a/pydantic_schemas/script_schema.py +++ b/pydantic_schemas/script_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: script-schema.json -# timestamp: 2024-09-13T18:34:55+00:00 +# timestamp: 2024-09-13T19:00:27+00:00 from __future__ import annotations diff --git a/pydantic_schemas/table_schema.py b/pydantic_schemas/table_schema.py index 55a5729..0795030 100644 --- a/pydantic_schemas/table_schema.py +++ b/pydantic_schemas/table_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: table-schema.json -# timestamp: 2024-09-13T18:34:58+00:00 +# timestamp: 2024-09-13T19:00:29+00:00 from __future__ import annotations diff --git a/pydantic_schemas/video_schema.py b/pydantic_schemas/video_schema.py index 0d6485b..3b376ab 100644 --- a/pydantic_schemas/video_schema.py +++ b/pydantic_schemas/video_schema.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: video-schema.json -# timestamp: 2024-09-13T18:35:04+00:00 +# timestamp: 2024-09-13T19:00:33+00:00 from __future__ import annotations