From 5ed10f4cc16459ec8d2130d291ff7189107664e0 Mon Sep 17 00:00:00 2001 From: mmwinther Date: Tue, 14 Nov 2023 16:20:54 +0100 Subject: [PATCH 01/25] Start of workflow to generate Pydantic models --- .github/workflows/generate-python.yml | 11 + .../datadoc_model/datadoc_model/model.py | 294 ++++++++++++++++++ 2 files changed, 305 insertions(+) create mode 100644 .github/workflows/generate-python.yml create mode 100644 generated/python/datadoc_model/datadoc_model/model.py diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml new file mode 100644 index 00000000..4a07b4e5 --- /dev/null +++ b/.github/workflows/generate-python.yml @@ -0,0 +1,11 @@ + +on: + pull_request: + +jobs: + generate-python: + runs-on: ubuntu-latest + container: docker.io/koxudaxi/datamodel-code-generator:0.23.0 + steps: + - run: | + datamodel-codegen --help diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py new file mode 100644 index 00000000..72baa7e4 --- /dev/null +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -0,0 +1,294 @@ +# generated by datamodel-codegen: +# filename: datadoc-json-schema.json +# timestamp: 2023-11-14T15:15:39+00:00 + +from __future__ import annotations + +from datetime import datetime +from enum import Enum +from typing import List, Optional +from uuid import UUID + +from pydantic import AnyUrl, BaseModel, Field +from typing_extensions import Literal + + +class Assessment(Enum): + SENSITIVE = 'SENSITIVE' + PROTECTED = 'PROTECTED' + OPEN = 'OPEN' + + +class DatasetStatus(Enum): + DRAFT = 'DRAFT' + INTERNAL = 'INTERNAL' + EXTERNAL = 'EXTERNAL' + DEPRECATED = 'DEPRECATED' + + +class DatasetState(Enum): + SOURCE_DATA = 'SOURCE_DATA' + INPUT_DATA = 'INPUT_DATA' + PROCESSED_DATA = 'PROCESSED_DATA' + STATISTICS = 'STATISTICS' + OUTPUT_DATA = 'OUTPUT_DATA' + + +class DataType(Enum): + STRING = 'STRING' + INTEGER = 'INTEGER' + DATETIME = 'DATETIME' + BOOLEAN = 'BOOLEAN' + + +class VariableRole(Enum): + IDENTIFIER = 'IDENTIFIER' + MEASURE = 'MEASURE' + START_TIME = 'START_TIME' + STOP_TIME = 'STOP_TIME' + ATTRIBUTE = 'ATTRIBUTE' + + +class LanguageStringType(BaseModel): + en: Optional[str] = None + nn: Optional[str] = None + nb: Optional[str] = None + + +class UnitType(Enum): + ARBEIDSULYKKE = 'ARBEIDSULYKKE' + BOLIG = 'BOLIG' + BYGNING = 'BYGNING' + EIENDOM = 'EIENDOM' + FAMILIE = 'FAMILIE' + FORETAK = 'FORETAK' + FYLKE = 'FYLKE' + HAVNEANLOEP = 'HAVNEANLOEP' + HUSHOLDNING = 'HUSHOLDNING' + KJOERETOEY = 'KJOERETOEY' + KOMMUNE = 'KOMMUNE' + KURS = 'KURS' + LOVBRUDD = 'LOVBRUDD' + PERSON = 'PERSON' + STAT = 'STAT' + STORFE = 'STORFE' + TRAFIKKULYKKE = 'TRAFIKKULYKKE' + TRANSAKSJON = 'TRANSAKSJON' + VARE_TJENESTE = 'VARE_TJENESTE' + VERDIPAPIR = 'VERDIPAPIR' + VIRKSOMHET = 'VIRKSOMHET' + + +class TemporalityTypeType(Enum): + FIXED = 'FIXED' + STATUS = 'STATUS' + ACCUMULATED = 'ACCUMULATED' + EVENT = 'EVENT' + + +class Dataset(BaseModel): + short_name: Optional[str] = Field( + None, + description='Name of (physical) data file, data table or dataset', + title='Short name', + ) + assessment: Optional[Assessment] = Field( + None, + description='Value assessment (sensitivity classification) for the data set', + title='Assessment', + ) + dataset_status: Optional[DatasetStatus] = Field( + None, description='Life cycle for data set', title='Data set status' + ) + dataset_state: Optional[DatasetState] = Field( + None, description='Steady state of data', title='Data set state' + ) + name: Optional[LanguageStringType] = Field( + None, description='Name of data set', title='Name' + ) + description: Optional[LanguageStringType] = Field( + None, description='Free text description of the data set', title='Description' + ) + data_source: Optional[LanguageStringType] = Field( + None, + description='Data source. Set either for the data set or instance variable.', + title='Data source', + ) + register_uri: Optional[LanguageStringType] = Field( + None, description='Link to register', title='Register' + ) + population_description: Optional[LanguageStringType] = Field( + None, + description='Description of the population covered in the data set. Includes unit type, spatial coverage and period of time.', + title='Description of population', + ) + version: Optional[str] = Field( + None, description='Version of data set', title='Version' + ) + version_description: Optional[LanguageStringType] = Field( + None, + description='Dataset version information in the form of descriptive text', + title='Version description', + ) + unit_type: Optional[UnitType] = Field( + None, + description='Unit Type for data file, table or data set. See Definitions of Unit Types https://www.ssb.no/en/metadata/definisjoner-av-statistiske-enheter', + title='Unit type', + ) + temporality_type: Optional[TemporalityTypeType] = Field( + None, + description='Temporality type. Either for the instance variable or the data set', + title='Temporality type', + ) + subject_field: Optional[LanguageStringType] = Field( + None, + description='Primary area of statistics in which the data set is included', + title='Subject field', + ) + keyword: Optional[List[str]] = Field( + None, + description='A list of searchable keywords that can contribute to the development of effective filtering and search services.', + title='Keyword(s)', + ) + spatial_coverage_description: Optional[LanguageStringType] = Field( + None, + description="Description of the data set's spatial coverage", + title='Spatial coverage description', + ) + id: Optional[UUID] = Field( + None, description='Unique identifier for the data set', title='Identifier' + ) + owner: Optional[LanguageStringType] = Field( + None, + description='Owner of the data set (responsible division in Statistics Norway). See also Classification of organisational units https://www.ssb.no/en/klass/klassifikasjoner/83', + title='Owner', + ) + file_path: Optional[str] = Field( + None, + description="The file path contains the data set's name and the path to where it is stored", + title='File path', + ) + metadata_created_date: Optional[datetime] = Field( + None, + description='Created date for metadata about the data set', + title='Metadata created date', + ) + metadata_created_by: Optional[str] = Field( + None, description='Created by identifiable person.', title='Metadata created by' + ) + metadata_last_updated_date: Optional[datetime] = Field( + None, + description='Last updated date for metadata about the dataset', + title='Metadata last updated date', + ) + metadata_last_updated_by: Optional[str] = Field( + None, + description='Last change made by identifiable person. ', + title='Metadata last updated by', + ) + contains_data_from: Optional[str] = Field( + None, + description='The data set contains data from date/time', + title='Contains data from', + ) + contains_data_until: Optional[str] = Field( + None, + description='The data set contains data up until date/time', + title='Contains data up until', + ) + + +class Variable(BaseModel): + short_name: Optional[str] = Field( + None, + description='Physical name of the variable in the dataset. Should match the recommended short name.', + title='Short name', + ) + name: Optional[LanguageStringType] = Field( + None, + description='Variable names can be inherited from VarDef, but can also be documented/changed here', + title='Name', + ) + data_type: Optional[DataType] = Field( + None, description='Data type', title='Data type' + ) + variable_role: Optional[VariableRole] = Field( + None, + description='Role of the instance variable in the data set', + title='Variable role', + ) + definition_uri: Optional[AnyUrl] = Field( + None, + description="A link (URI) to the variable's definition in Vardok/VarDef", + title='Definition URI', + ) + direct_person_identifying: Optional[bool] = Field( + None, + description='Direct Person identifying Information (DPI). Some of the values \u200b\u200bin an instance variable kan be DPI, others not. In this case, DPI is set equal to true. For example, the variable exporter where some of the values \u200b\u200bcan be organization number, others social security numbers (sole proprietorships).', + title='Direct Person identifying Information (DPI)', + ) + data_source: Optional[LanguageStringType] = Field( + None, + description='Data source. Set at data set level, but can be overwritten at variable instance level.', + title='Data source', + ) + population_description: Optional[LanguageStringType] = Field( + None, + description='The population the variable describes can be specified in more detail here. Set at dataset level, but can be overwritten at instance variable level.', + title='Population description', + ) + comment: Optional[LanguageStringType] = Field( + None, + description='Further clarification of the variables definition', + title='Comment', + ) + temporality_type: Optional[TemporalityTypeType] = Field( + None, + description='Temporality type. Set either for variable instance or dataset.', + title='Temporality type', + ) + measurement_unit: Optional[str] = Field( + None, description='Measurement unit', title='Measurement unit' + ) + format: Optional[str] = Field( + None, + description='The format of the values \u200b\u200b(physical format or regular expression) in machine-readable form for validation. This can be used as a further specification of the data type (dataType) in those cases where this is relevant.', + title='Format', + ) + classification_uri: Optional[AnyUrl] = Field( + None, + description='Link (URI) to valid classification or code list', + title='Classification or codelist URI', + ) + sentinel_value_uri: Optional[AnyUrl] = Field( + None, + description='A link (URI) to an overview of sentinel values included in the variable. Proposals for the standardization of sentinel values \u200b\u200bhave been drafted, but this has not yet been processed by the Standards Committee in Statistics Norway: 01 - In total, 02 - Sum, 03 - Subtotal, 04 - Other, 05 - Rest, 06 - Invalid value, 07 - Unspecified, 08 - Not relevant', + title='Sentinel value URI', + ) + invalid_value_description: Optional[LanguageStringType] = Field( + None, + description='Invalid value(s) description used in addition (or as an alternative) to standard sentinel values.', + title='Invalid value(s) description', + ) + id: Optional[UUID] = Field( + None, + description='Unique SSB identifier for the instance variable in the data set', + title='Identifier', + ) + contains_data_from: Optional[datetime] = Field( + None, + description='The instance variable in the data set contains data from and including this date. This can be useful information for data sets that contain many instance variables in addition to data for many periods/years. In many cases, it will then be the case that some variables only contain data for the most recent periods/years, e.g. if the entire data set contains data from 1970 to 2020, while some instance variables only contain data from 1998 onwards.', + title='Contains data from', + ) + contains_data_until: Optional[datetime] = Field( + None, + description='The instance variable in the data set contains data up to and including this date. This can be useful information for data sets that contain many instance variables in addition to data for many periods/years. In many cases, it will then be the case that some of the instance variables in the data set are terminated (no longer updated) after a given point in time.', + title='Contains data up until', + ) + + +class Model(BaseModel): + percentage_complete: Optional[int] = None + document_version: Literal['2.0.0'] = None + dataset: Optional[Dataset] = None + variables: Optional[List[Variable]] = None From 279d2b8a90d18c49dd2b59366317875aacf869c1 Mon Sep 17 00:00:00 2001 From: mmwinther Date: Wed, 15 Nov 2023 08:42:15 +0100 Subject: [PATCH 02/25] Run generation command to stdout --- .github/workflows/generate-python.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index 4a07b4e5..df7013b3 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -7,5 +7,12 @@ jobs: runs-on: ubuntu-latest container: docker.io/koxudaxi/datamodel-code-generator:0.23.0 steps: - - run: | - datamodel-codegen --help + - name: Checkout Project + uses: actions/checkout@v1 + - run: > + datamodel-codegen + --input-file-type jsonschema + --input src/datadoc-json-schema/datadoc-json-schema.json + --output-model-type pydantic_v2.BaseModel + --force-optional + --use-default From 05ac1dbb3e6eb23358441a0643642ed82746f65d Mon Sep 17 00:00:00 2001 From: mmwinther Date: Wed, 15 Nov 2023 10:31:58 +0100 Subject: [PATCH 03/25] Generate Pydantic models --- .github/workflows/generate-python.yml | 40 +++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index df7013b3..8ffa6601 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -7,12 +7,46 @@ jobs: runs-on: ubuntu-latest container: docker.io/koxudaxi/datamodel-code-generator:0.23.0 steps: - - name: Checkout Project - uses: actions/checkout@v1 - - run: > + - name: Generate token + id: generate_token + uses: actions/create-github-app-token@v1 + with: + app-id: ${{ secrets.DAPLA_BOT_APP_ID }} + private-key: ${{ secrets.DAPLA_BOT_PRIVATE_KEY }} + + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + token: ${{ steps.generate_token.outputs.token }} + + - name: Configure Git + run: | + git config user.name "dapla-bot[bot]" + git config user.email "143391972+dapla-bot[bot]@users.noreply.github.com" + + - name: Generate Python + run: > datamodel-codegen --input-file-type jsonschema --input src/datadoc-json-schema/datadoc-json-schema.json --output-model-type pydantic_v2.BaseModel --force-optional --use-default + --output generated/python/datadoc_model/datadoc_model/model.py + + - name: Check for modified files + id: git-check + run: echo ::set-output name=modified::$(if [ -n "$(git status --porcelain)" ]; then echo "true"; else echo "false"; fi) + + - name: Commit + if: steps.git-check.outputs.modified == 'true' + run: | + git add -A + git commit -m '[GENERATE] Pydantic models from JSON Schema' + + - name: Push + uses: ad-m/github-push-action@v0.8.0 + with: + github_token: ${{ steps.generate_token.outputs.token }} + branch: ${{ github.ref }} From 878193522d419e54da1016da507d3646d90e11f8 Mon Sep 17 00:00:00 2001 From: mmwinther Date: Wed, 15 Nov 2023 10:56:37 +0100 Subject: [PATCH 04/25] Install git --- .github/workflows/generate-python.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index 8ffa6601..62e536e1 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -14,6 +14,9 @@ jobs: app-id: ${{ secrets.DAPLA_BOT_APP_ID }} private-key: ${{ secrets.DAPLA_BOT_PRIVATE_KEY }} + - name: Install Git + run: sudo apk update && sudo apk add git + - name: Checkout uses: actions/checkout@v3 with: From 186e5e650117ff49337b9f371340de44ae018350 Mon Sep 17 00:00:00 2001 From: mmwinther Date: Wed, 15 Nov 2023 11:01:37 +0100 Subject: [PATCH 05/25] Install datamodel-codegen, don't use the container --- .github/workflows/generate-python.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index 62e536e1..54433dae 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -5,7 +5,6 @@ on: jobs: generate-python: runs-on: ubuntu-latest - container: docker.io/koxudaxi/datamodel-code-generator:0.23.0 steps: - name: Generate token id: generate_token @@ -14,9 +13,6 @@ jobs: app-id: ${{ secrets.DAPLA_BOT_APP_ID }} private-key: ${{ secrets.DAPLA_BOT_PRIVATE_KEY }} - - name: Install Git - run: sudo apk update && sudo apk add git - - name: Checkout uses: actions/checkout@v3 with: @@ -28,6 +24,13 @@ jobs: git config user.name "dapla-bot[bot]" git config user.email "143391972+dapla-bot[bot]@users.noreply.github.com" + - uses: actions/setup-python@v2 + with: + python-version: 3.11 + + - name: Install datamodel-codegen + run: pip install datamodel-code-generator==0.23.0 + - name: Generate Python run: > datamodel-codegen From 815f20ab2f7ea4c01fab4be9ae743d4663ae6a7a Mon Sep 17 00:00:00 2001 From: mmwinther Date: Wed, 15 Nov 2023 11:44:28 +0100 Subject: [PATCH 06/25] Install using pipx --- .github/workflows/generate-python.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index 54433dae..50dd2abc 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -28,8 +28,13 @@ jobs: with: python-version: 3.11 + - name: Install pipx + run: | + python -m pip install --upgrade pipx + python -m pipx ensurepath + - name: Install datamodel-codegen - run: pip install datamodel-code-generator==0.23.0 + run: python -m pipx install datamodel-code-generator==0.23.0 - name: Generate Python run: > From 03addb50b931a4b0ed50721d208d8751f88d687c Mon Sep 17 00:00:00 2001 From: mmwinther Date: Wed, 15 Nov 2023 12:18:28 +0100 Subject: [PATCH 07/25] Specify python 3.11.5 --- .github/workflows/generate-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index 50dd2abc..09b0e236 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: 3.11 + python-version: 3.11.5 - name: Install pipx run: | From d6827541d1f924f0452f744e6837c70bc6afe0ca Mon Sep 17 00:00:00 2001 From: mmwinther Date: Thu, 16 Nov 2023 08:54:44 +0100 Subject: [PATCH 08/25] Bump datamodel-codegen to 0.24.0 --- .github/workflows/generate-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index 09b0e236..9e1c93b3 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -34,7 +34,7 @@ jobs: python -m pipx ensurepath - name: Install datamodel-codegen - run: python -m pipx install datamodel-code-generator==0.23.0 + run: python -m pipx install datamodel-code-generator==0.24.0 - name: Generate Python run: > From 146fbf1a312e49d712e009d50044b9fe7449595a Mon Sep 17 00:00:00 2001 From: mmwinther Date: Thu, 16 Nov 2023 10:36:34 +0100 Subject: [PATCH 09/25] Install pyyaml for datamodel-codegen --- .github/workflows/generate-python.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index 9e1c93b3..ddc5ba2e 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -34,7 +34,10 @@ jobs: python -m pipx ensurepath - name: Install datamodel-codegen - run: python -m pipx install datamodel-code-generator==0.24.0 + # We must manually install pyyaml as a workaround for https://github.com/koxudaxi/datamodel-code-generator/issues/1697 + run: | + python -m pipx install datamodel-code-generator==0.24.0 + python -m pipx inject datamodel-code-generator pyyaml - name: Generate Python run: > From 7b86c96a01ef45ce63d42c71e080651678a9a7be Mon Sep 17 00:00:00 2001 From: mmwinther Date: Thu, 16 Nov 2023 10:43:48 +0100 Subject: [PATCH 10/25] Correctly specify branch to push to --- .github/workflows/generate-python.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-python.yml b/.github/workflows/generate-python.yml index ddc5ba2e..92db69bb 100644 --- a/.github/workflows/generate-python.yml +++ b/.github/workflows/generate-python.yml @@ -51,7 +51,7 @@ jobs: - name: Check for modified files id: git-check - run: echo ::set-output name=modified::$(if [ -n "$(git status --porcelain)" ]; then echo "true"; else echo "false"; fi) + run: echo modified=$(if [ -n "$(git status --porcelain)" ]; then echo "true"; else echo "false"; fi) >> $GITHUB_OUTPUT - name: Commit if: steps.git-check.outputs.modified == 'true' @@ -63,4 +63,4 @@ jobs: uses: ad-m/github-push-action@v0.8.0 with: github_token: ${{ steps.generate_token.outputs.token }} - branch: ${{ github.ref }} + branch: ${{ github.head_ref }} From bb4bcea7eb0ceb7835d46e53301bf2ed02253b72 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:44:28 +0000 Subject: [PATCH 11/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 72baa7e4..f8314890 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-14T15:15:39+00:00 +# timestamp: 2023-11-16T09:44:27+00:00 from __future__ import annotations From 80fe377b496a4d9600bd22fab157003b3bb15f95 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:45:02 +0000 Subject: [PATCH 12/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index f8314890..6183ce28 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:44:27+00:00 +# timestamp: 2023-11-16T09:45:02+00:00 from __future__ import annotations From 306d101c05dae2556f43db18c0991e651722682a Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:45:36 +0000 Subject: [PATCH 13/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 6183ce28..27325b3d 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:45:02+00:00 +# timestamp: 2023-11-16T09:45:36+00:00 from __future__ import annotations From a91146edccc7143d0f088f48aa689030e8ad51f9 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:46:11 +0000 Subject: [PATCH 14/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 27325b3d..93dfcf2c 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:45:36+00:00 +# timestamp: 2023-11-16T09:46:11+00:00 from __future__ import annotations From efe56b0b096eaf5b39130e19a6821e1963e9eaa7 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:46:45 +0000 Subject: [PATCH 15/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 93dfcf2c..882469eb 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:46:11+00:00 +# timestamp: 2023-11-16T09:46:45+00:00 from __future__ import annotations From e66cf62a4c8542ed442b06376534fa9ea420a608 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:47:18 +0000 Subject: [PATCH 16/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 882469eb..117c411e 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:46:45+00:00 +# timestamp: 2023-11-16T09:47:18+00:00 from __future__ import annotations From ae4bbbe1539f2dc550c351ca9ef45e92b7ea3b91 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:47:54 +0000 Subject: [PATCH 17/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 117c411e..054f3601 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:47:18+00:00 +# timestamp: 2023-11-16T09:47:54+00:00 from __future__ import annotations From b507a0382e70030880df9f78b725cb54681c3dd0 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:48:28 +0000 Subject: [PATCH 18/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 054f3601..503ce1e3 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:47:54+00:00 +# timestamp: 2023-11-16T09:48:28+00:00 from __future__ import annotations From 15743ef9e06f278239bb998f3c4b7937b77e415d Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:49:03 +0000 Subject: [PATCH 19/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 503ce1e3..0b13a45c 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:48:28+00:00 +# timestamp: 2023-11-16T09:49:03+00:00 from __future__ import annotations From 2ec7f2ac1becb205edc253772885c091e717e10c Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:49:39 +0000 Subject: [PATCH 20/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 0b13a45c..79210ecd 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:49:03+00:00 +# timestamp: 2023-11-16T09:49:39+00:00 from __future__ import annotations From d2f0372440e2e79e777fdf7e8237e65e5d0001cc Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:50:17 +0000 Subject: [PATCH 21/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 79210ecd..606c04c7 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:49:39+00:00 +# timestamp: 2023-11-16T09:50:17+00:00 from __future__ import annotations From 4deb7873198e1676181f1379eb9cb074df815e23 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:50:52 +0000 Subject: [PATCH 22/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 606c04c7..c6dd80ae 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:50:17+00:00 +# timestamp: 2023-11-16T09:50:52+00:00 from __future__ import annotations From d53cef07493eac527c18e5552cef97fcbfe121b0 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:51:23 +0000 Subject: [PATCH 23/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index c6dd80ae..524140ab 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:50:52+00:00 +# timestamp: 2023-11-16T09:51:23+00:00 from __future__ import annotations From 92425571a71b815292dd46334e9963fbee06aa99 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:51:57 +0000 Subject: [PATCH 24/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 524140ab..4a73242b 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:51:23+00:00 +# timestamp: 2023-11-16T09:51:57+00:00 from __future__ import annotations From fa09067039213487016a4a605ffd6248c3c4be58 Mon Sep 17 00:00:00 2001 From: "dapla-bot[bot]" <143391972+dapla-bot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:52:30 +0000 Subject: [PATCH 25/25] [GENERATE] Pydantic models from JSON Schema --- generated/python/datadoc_model/datadoc_model/model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated/python/datadoc_model/datadoc_model/model.py b/generated/python/datadoc_model/datadoc_model/model.py index 4a73242b..e7fc39a6 100644 --- a/generated/python/datadoc_model/datadoc_model/model.py +++ b/generated/python/datadoc_model/datadoc_model/model.py @@ -1,6 +1,6 @@ # generated by datamodel-codegen: # filename: datadoc-json-schema.json -# timestamp: 2023-11-16T09:51:57+00:00 +# timestamp: 2023-11-16T09:52:30+00:00 from __future__ import annotations