From a98d5c1af436ee541fcd8a2b51a3ea10c3c14738 Mon Sep 17 00:00:00 2001 From: Gordon Blackadder Date: Fri, 13 Sep 2024 15:04:22 -0400 Subject: [PATCH] following merge from main - apply schema changes to pydantic and excel --- excel_sheets/Document_metadata.xlsx | Bin 38854 -> 38763 bytes excel_sheets/Indicator_metadata.xlsx | Bin 51139 -> 51233 bytes excel_sheets/Indicators_db_metadata.xlsx | Bin 15572 -> 15572 bytes excel_sheets/Microdata_metadata.xlsx | Bin 53806 -> 53806 bytes excel_sheets/Resource_metadata.xlsx | Bin 8437 -> 8436 bytes excel_sheets/Script_metadata.xlsx | Bin 40333 -> 40333 bytes excel_sheets/Table_metadata.xlsx | Bin 38933 -> 38933 bytes excel_sheets/Video_metadata.xlsx | Bin 16589 -> 16588 bytes pydantic_schemas/document_schema.py | 28 +++++++---------------- pydantic_schemas/geospatial_schema.py | 2 +- pydantic_schemas/image_schema.py | 2 +- pydantic_schemas/indicator_schema.py | 15 ++++++------ pydantic_schemas/indicators_db_schema.py | 2 +- pydantic_schemas/microdata_schema.py | 2 +- pydantic_schemas/resource_schema.py | 2 +- pydantic_schemas/script_schema.py | 2 +- pydantic_schemas/table_schema.py | 2 +- pydantic_schemas/video_schema.py | 2 +- 18 files changed, 24 insertions(+), 35 deletions(-) diff --git a/excel_sheets/Document_metadata.xlsx b/excel_sheets/Document_metadata.xlsx index 4a357c7c71052c2819867ecaa6e03c8a0d7c2d09..d5237aa11a64797ce72e8d4a27fde3ce21b342cd 100644 GIT binary patch delta 16965 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 delta 17358 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 diff --git a/excel_sheets/Indicator_metadata.xlsx b/excel_sheets/Indicator_metadata.xlsx index 3131f10e5e141523f14acc2f0732990c1958ec7b..3fcbb6824cca0345a7c699f83651e877ccdd9d89 100644 GIT binary patch delta 19392 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 delta 19221 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 LCKF;Rr5FDnBRz@_ diff --git a/excel_sheets/Indicators_db_metadata.xlsx b/excel_sheets/Indicators_db_metadata.xlsx index 91d092f0ab61facfd4fce8867a12356c1d8436e1..9f2d6b80d635b8c24626f63d893eefb73e7804c7 100644 GIT binary patch delta 408 zcmcaod8Lvkz?+#xgn@y9gTb|8BF{k%*9zUpToIRz6R*nGAIv&zz|$7L^vS#ve#aEl zzNRi+&da8q^Cm54D{psla<)qCZ_CKpWjWJj*Z#k(&S`#&`z@0l`*Xv9?n2XB>-wF3 zmzJq~Vp4de93|TA@Nxji52y{b>cl7z;pG?(q4-_wzm7uoPM4w@A*~A_@;zz ziG!=&iI+ delta 408 zcmcaod8Lvkz?+#xgn@y9gCVbEBF{mNyb|3=L3R206R*nG`}!X?;A#7R>Pq$NI)+<| z)`$zJPna-+<&l`>J+X^R0+X)1yMKAwTIr_KeII}S*tpi?3)5`}{e@peZUn@9*;W|1 zAYQ#XO`k#O-N{umcw3|o2Ta>gPoH43rmHwYQW75nwi)XG}_j=R1SvwLJGu@j%KW_Qc;KxeZ?NhD< zEk5ATbvvM6{HODMj~yDP9>1B-^zx{IM~@bW z-fa}h45TLunLP(_f1AZIg1FHZk3n1qOCK<|&&mcKijyx{nS+#YTib&uA8Qv7HObl% WM4hz;%dy#5gLuw1ZXl}L#uETU{j_xe diff --git a/excel_sheets/Microdata_metadata.xlsx b/excel_sheets/Microdata_metadata.xlsx index 422ac6618d7515c150fa391ff3b54e753944dbf9..173a2fdb33f1708b36b6b7b23a4049d00513fe96 100644 GIT binary patch delta 562 zcmZ3tgn8W(W}X0VW)=|!1_llW=Zc9u2RWQ8bR(xN+RZxgs(k%HzrzMRZSkqE_Lg2c zw8S-1&&Rs4<%o*Fc8!nQx|a0{EiTLVkJ^^Up(peB|L64RiO0Avv)1sz7?C678 zW?YZ2-<)`YyCI|RMTw5k#bpKeS(j_t9%kHQCjYA;z-Svw`;xV4yo(LKZ#J~nUORK@ zKVy^02c!CV5Nt8!QB z%#?T5zoUPiBV79g(M%-^v-^D)|bOeA;nN?_~DZ4L5U*LpOcWOJ6-F+0SbCfrKVzgvqa<15{%khB+ zM9Yhs@`LCwm1hnh+Aj4LFNl^Zju8dX6&)75e4qf_zkf!mHxC0tcG+b6MUtDZPmKcW zH(n&d4N~X1b`_ZZy5lUEK5`_287Mwk?!oRWz=2RU*|bR)Uf{a-Wjs(ih#|6v23w*RN5RKKpv z;aH?2E}%YP!VH#2VygGTE}8@;U3qtZ^0c+mO{e=l{{FFXEyvrPWsLDnpCwit+#!*3 z+jZUFS#LXS*gLBF!;abr#&T`fi*S7@S@vM+zYyz|RT_B*lr$H69Mm}TCnv>y>BY^L z>RZc%BzSKuI@+f+rIIs!TD`%IANhx;oOvQJd*-X(cJE(zdP`6J@bAwTE8Y2~u_{+H zQ-UPUmO8lVo%pC!FA>Ek?piqKZ?MB=4`B;gn{_ueD_6glH|zHabKQETYxkNp=1+Ck zhwq81>sc57H+^C0vYTe%QsLsqCOdHb_?-Vq8aW_zBWK3UQQrKC(UOfRr)0A(#|It| zEiY=y52C|Vo;iSMyVP5}AX=(8MifL>bXf56fdX*<{u!y>JPZukWs~g}Np8MAH43cX zc##M?dzBg6K!5q`~z6(*+=Ua^YDUc=Sx( zde$5y_U^1bh|)jj0-{PG)NTmHcpfb14xxG>)MW@Ic>ydJ522P`a0O|9bHNfssb2&e Sop8|_#G8B34MaV?=m`K?m-Sfy diff --git a/excel_sheets/Resource_metadata.xlsx b/excel_sheets/Resource_metadata.xlsx index 65bd3f3c7d0462f7aa26629c586e76e05770a27b..0aa789affe1843a60ecde0de9f553fa2d7202ecf 100644 GIT binary patch delta 558 zcmezB_{EVYz?+#xgn@y9gTbj{BF{lirwZLjv97Z_UroHGS-)lO1hLYc4Hk_pM^ps1 zYkb_+^~||5aCg0b)HXgA^S+P2e{5X4#fsytvYo5EK~Q_9>8*RJ3lC3|?QCN3_|*}% z)JRyby;^?lqCY+C9A5iZGdrFA$s3`PDxx`~#WkYm%^H)cz_$Jy=b08WR&RNs;TRfL zkjlB(x8Cf`NvFP*(JSf`B~C4zxpPk->-v8F^PfMtJ{QtlKJnzWjD^Ztp91~FTQA?( z{$cHndFl0{7uI}Yaa`UIUFI1#>-O%uwv$cQUuV5961sV{S=05V_4n1T_y1dcq3ZJ6 z-SrasOg9g$ub(_0+3UKIGh^l`3$QUT%u#1x5C#TFMUMXFe~emeOimS>wKxv(f#`Q) z&dfl1va!^25LZSzjuFJIk$DW_Cd&GNx$EU@5WzV4i<}uqjgGtwqZ*Ce!OcfQ1Ne|0a7TM f^CvedXo758qaec+B0ITIR&?@x1p&4Nav)^@`W(dO delta 558 zcmez3_|=goz?+#xgn@y9gCV=NBb^(u+j*AuU4*4HsKX`E&~!l|O7*0{s9 zbGxgF?-YrxzrQa@eeF>2SYm&_{Ozs_joI=aHGefs)LC}*#V)%-*=sreA{Gvps!Oz{ z&U{h4HnXWWVc1&WxF(EWpOVFh`w%K^Pb!6*-&#Flw_gWtVK$u9LGt1mon-a%Lbk+VV1tcPD$uD}gvUK#ttx zPI+~CP;l?O%aka^%)pQ)z`(!@v={~&7#~eOFE0bq@D`{+eKMDVR18SN;>kB388b34 zXfrV|@WWIC=>|ptX^^}1%kzt}lk)Sk^(u060=yZSL>OREtQ%?k`th!{K*hg-21uc3 gE|}b)pb4^VwSo*&sO;ndS<%V&6a?57%7K&t09=v8^#A|> diff --git a/excel_sheets/Script_metadata.xlsx b/excel_sheets/Script_metadata.xlsx index a08a0c7126571af2544745c1a4b2e27768d107cd..60295413986841759b61bda3bfb05e3f6926df2e 100644 GIT binary patch delta 501 zcmeC(&D6V_i6_9DnMH(wfq{d;sbV6}K@O)1-N@}yw*n_#m9O{pKWxC$_W#tB>eowT zJ-TW}pqC0;`+vyP9`N8@=9(Wp zeFMW)y$lBUTV6BW$&7G zJ=3ffDapV7xTxUOZLYkotCio%8P6uoPYX6hD35N$M_ z6HMFANCDB47tgeT2m9pbGtEI_3bQ~qOirBT0-}~fsJ9Txcs5wD5<=~VP^@#ng5Gm1 YK^ofTfKAyy#~Q@@Gsg`?xyE+>g%fJPCK6~?YULT zI8s`-#KARo!eiHe1}3I4BCj96na?!Kb(X@52Zb}|PTKyeaBF1xr0IXu^yQ1fa&PQi zk;nR6e(~$@|B)}OlDB{JN-j;b;Y{JJ|L0rBj2sZUkuziFC~yA6XvxNuU9wr1V-639 zJ}q*b7er4{nq&{6HInMV;w$q+xS4WFHt(-o1*WrG&wy#mi4n{|@yU~?JO@eFOx?l= zqK&3=f@#|sDU3j4CNG|80}uAe&u5y0#1v+MY?z!l%LPO&hfr@Jl<{n^U?q?O8onPw evCaYWyysYg1l#7AgXQK}gQ!1q+(4AeTu%TB?AU(* diff --git a/excel_sheets/Table_metadata.xlsx b/excel_sheets/Table_metadata.xlsx index d0e32ec84e2862fc29ea24910184ec32e9d37f65..04da6475417740e791d1934535c9477f19ec913f 100644 GIT binary patch delta 501 zcmbQbfobXnCY}IqW)=|!1_llWmx_rz2RU3SbR%#0F*HoPDqnxl@2~++TYT!Py``7@ z4lL3Wzu>2!Xvld)*K5z(MVX6^thjr7^0c+mP29(S{Qq+^EbDD+8RPus&k`#R?vTj2 z?Yi)BY^L z>f6eMBzSKuI@+i7q3Lj|YCVtHznccC#+FCYmi^kN|10a!B{!LS^W@@}J^j3_dx=%= z%r(7YRtuEGpHxh==gZ{{Kl;n$_wI(YiE12HRWa$$pKRS#e&A12 zah3hH+g0}^zUA7?wCjH^SCpsPaHsI@|L0rBh#U~QkuziFC~yA6XvxOpQn6W=V2R%*8dzN{l9-FBZ%HL zkrPZGosi!fd~8K{3+%ju@zJ7LDb7BE+9&ODwryTP`e=%<210KJA~?mP?x7! Yf;8|=2b+>(hr2RU*}bR)II=KYv>RleTW|F8j1+y7Hns$bV_ z;9RsuTtI!ogc&T4#8mHzU98bC%=-S`^Yk^|gQ>@V)c&~t_J;sl{`xf_1G@o zJh3D`y;|u!!=gKj1vh%M_&&VGs;psqm~YR7`AO{o)1PwjObTdX={a=g{INGHLW;tE zt-s*Qq{?V*lA-Ao8d8wPS>N3G-^}Nv4`1NDCr@MJOlQBE zX6hZLZ|`<}{lCo@ES7Hn<@Na0p$efbGXMTW|K>#w2;In;F>{nRe`2&`W6CYrtjjTz z2SlF`xyTEmXDjhpf#}sS^GC3n0{A(22Ahij$j6gPZsNc4wC-gzmpL} z@0!R7rjJfa0nwASr`W)QeRBR3bCB4IDfS@hwnmQr|ti#Db=r+ zxO#N&ifglIY&oJLuwCQhwytN+oq@aS{iC+=v6%OL{QYC&S`#aex5{>|@&-ZenWney zsjfWSCfnJ>;_<5^Y^jm3UVF9t+C_hQ*g3rRuV!{S`cpSTB~?UoMvH4i&zm(SRe^2& zH_kIHW~|=wLZeZGH74>rUc@LpHQBVy zFzQuDS540H?n9Yxq<@6voZGygDTlh4?h$%6tFX6PJs1_ohZfWtro zFV6i>OD{7e1zzL6?5Ch;$azG!XwTY3nTwCCxO;o@w6)9!bC3V{|L10yh*js@ z<>~h=Kg9$`@NCO$cG>R5cgBy2#b&})#cmhr!?DlTKKt>dxJ&!wC=1$*1kiBwDjbu&(<9|yAhWMh? zoML@F5Q(aB@;`eS#ut;N9ppeZSv$xudQ6UR&;&becAHa+G%#UYXGV9v?&JjyYHXEu GAbSAdB-u6q 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