From 011143814d5b6c62702d32b889109f5ccfcc85d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi?= <remi.cresson@inrae.fr> Date: Fri, 29 Nov 2024 12:19:03 +0100 Subject: [PATCH 1/2] Use name when no alias is provided --- stac_extension_genmeta/core.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stac_extension_genmeta/core.py b/stac_extension_genmeta/core.py index 1a6669b..a2b994d 100644 --- a/stac_extension_genmeta/core.py +++ b/stac_extension_genmeta/core.py @@ -2,7 +2,8 @@ Processing extension """ from typing import Any, Generic, TypeVar, Union, cast -from pystac.extensions.base import PropertiesExtension, ExtensionManagementMixin +from pystac.extensions.base import PropertiesExtension, \ + ExtensionManagementMixin import pystac from pydantic import BaseModel, Field import re @@ -71,7 +72,7 @@ def create_extension_cls( # Set properties dic = md.model_dump(exclude_unset=True) for key, value in dic.items(): - alias = model_cls.__fields__[key].alias + alias = model_cls.__fields__[key].alias or key self._set_property(alias, value, pop_if_none=False) @classmethod @@ -114,6 +115,7 @@ def create_extension_cls( cls.ensure_owner_has_extension(obj, add_if_missing) return cast(CustomExtension[T], AssetCustomExtension(obj)) elif isinstance(obj, pystac.Collection): + cls.ensure_has_extension(obj, add_if_missing) return cast(CustomExtension[T], CollectionCustomExtension(obj)) raise pystac.ExtensionTypeError( f"{model_cls.__name__} does not apply to type " @@ -136,7 +138,6 @@ def create_extension_cls( class CollectionCustomExtension(CustomExtension[pystac.Collection]): properties: dict[str, Any] - additional_read_properties: Iterable[dict[str, Any]] | None = None def __init__(self, collection: pystac.Collection): self.properties = collection.extra_fields -- GitLab From 9f3b70de673ed4ba677d49f3dc47aa41509900d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi?= <remi.cresson@inrae.fr> Date: Fri, 29 Nov 2024 12:19:53 +0100 Subject: [PATCH 2/2] Use name when no alias is provided --- stac_extension_genmeta/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stac_extension_genmeta/__init__.py b/stac_extension_genmeta/__init__.py index de41fca..bf1f469 100644 --- a/stac_extension_genmeta/__init__.py +++ b/stac_extension_genmeta/__init__.py @@ -1,2 +1,2 @@ from .core import create_extension_cls -__version__ = "0.0.24" \ No newline at end of file +__version__ = "0.0.25" \ No newline at end of file -- GitLab