Merge branch 'main' into data-cube-variables

Author: fmigneault

CHANGELOG.md

@@ -32,7 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (fixes [#69](https://github.com/stac-extensions/mlm/issues/69)).
 
 ### Changed
- 
+
 - Update `stac-model==0.4.0` to provide corresponding additions for `variables` reference.
 - Refactor `ModelInput` and `ModelOutput` objects to use a new `ModelBandsOrVariablesReferences` definition
   combining the `ModelBand` and `ModelDataVariable` lists.
@@ -44,6 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Refactor the JSON schema `mlm:output` property to employ a `ModelOutput` object definition
   rather than directly provided properties nested under the array.
 - Refactor the JSON schema to allow the omission of `bands` under `mlm:input` if the `variables` property is provided.
+- Make `total_parameters` optional in `stac-model` and enforce greater than 0 to match with JSON-schema
+  (applied in [#101](https://github.com/stac-extensions/mlm/pull/101).
 - Update `stac-model==0.3.0` to provide `ValueScalingObject` from installed package.
 
 ### Deprecated

pyproject.toml

@@ -123,6 +123,38 @@ glob_exclude = [
 search = "https://stac-extensions.github.io/mlm/v{current_version}/schema.json"
 replace = "https://stac-extensions.github.io/mlm/v{new_version}/schema.json"
 
+[[tool.bumpversion.files]]
+glob = "**/*.yml"
+glob_exclude = [
+  ".git/**",
+  "**/__pycache__/**",
+  ".mypy_cache/**",
+  ".tox/**",
+  ".venv/**",
+  "_build/**",
+  "build/**",
+  "dist/**",
+  "node_modules/**",
+]
+search = "https://stac-extensions.github.io/mlm/v{current_version}/schema.json"
+replace = "https://stac-extensions.github.io/mlm/v{new_version}/schema.json"
+
+[[tool.bumpversion.files]]
+glob = "**/*.yaml"
+glob_exclude = [
+  ".git/**",
+  "**/__pycache__/**",
+  ".mypy_cache/**",
+  ".tox/**",
+  ".venv/**",
+  "_build/**",
+  "build/**",
+  "dist/**",
+  "node_modules/**",
+]
+search = "https://stac-extensions.github.io/mlm/v{current_version}/schema.json"
+replace = "https://stac-extensions.github.io/mlm/v{new_version}/schema.json"
+
 [[tool.bumpversion.files]]
 glob = "**/*.md"
 glob_exclude = [

stac-model.bump.toml

@@ -44,4 +44,3 @@ replace = """
 name = "stac-model"
 version = "{new_version}"
 """
-

stac_model/schema.py

@@ -49,7 +49,7 @@ class MLModelProperties(Runtime):
     input: list[ModelInput]
     output: list[ModelOutput]
 
-    total_parameters: int
+    total_parameters: Annotated[int | None, OmitIfNone] = Field(default=None, ge=0)
     pretrained: Annotated[bool | None, OmitIfNone] = Field(default=True)
     pretrained_source: Annotated[str | None, OmitIfNone] = None