eodag 3.4.1.post1__tar.gz → 3.4.2__tar.gz

eodag-3.4.2/.github/workflows/deploy.yml

@@ -0,0 +1,72 @@
+name: Deploy if ready
+
+on:
+  pull_request:
+    types: [closed]
+    branches: [develop]
+  workflow_dispatch:
+
+jobs:
+  # job will be executed when 'new-release' branch is merged in 'develop', or manually
+  merge-and-tag:
+    if: ${{ (github.event.pull_request.merged == true && github.head_ref == 'new-release') || github.event_name == 'workflow_dispatch' }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Checkout the repo
+      uses: actions/checkout@v4
+      with:
+        # Get history and tags for SCM versioning to work
+        fetch-depth: 0
+    - name: Install the latest version of uv with cache enabled
+      uses: astral-sh/setup-uv@v3
+      with:
+        version: "latest"
+        enable-cache: true
+        cache-dependency-glob: ""
+    - name: Install python-semantic-release in venv
+      run: |
+        uv venv
+        source .venv/bin/activate
+        uv pip install python-semantic-release packaging
+    - name: Set Git config
+      run: |
+        git config user.name "github-actions[bot]"
+        git config user.email "'github-actions[bot]@users.noreply.github.com"
+    - name: Git merge develop in master
+      run: |
+        git checkout master
+        git merge --no-ff origin/develop
+        git push origin master
+    - name: Git tag
+      run: |
+        source .venv/bin/activate
+        NEW_TAG=$(semantic-release --noop version --print-tag)
+        git tag "$NEW_TAG"
+        git push origin tag "$NEW_TAG"
+
+  publish:
+    needs: merge-and-tag
+    uses: CS-SI/eodag/.github/workflows/publish.yml@develop
+
+  post-deploy:
+    needs: publish
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout the repo
+      uses: actions/checkout@v4
+      with:
+        # Get history and tags for SCM versioning to work
+        fetch-depth: 0
+    - name: Set Git config
+      run: |
+        git config user.name "github-actions[bot]"
+        git config user.email "'github-actions[bot]@users.noreply.github.com"
+    - name: Git merge master in develop
+      run: |
+        git checkout develop
+        git merge --no-ff origin/master
+        git push origin develop

eodag-3.4.1.post1/.github/workflows/deploy.yml → eodag-3.4.2/.github/workflows/publish.yml

@@ -1,12 +1,13 @@
 name: Publish to PyPI
 
 on:
-  push:
-    tags:
-      - "v*"
+  # reusable workflow
+  workflow_call:
+  # manually triggerable
   workflow_dispatch:
 
 jobs:
+  # job will be executed when 'Pre-deploy' workflow succeeds, or manually
   build-n-publish:
     name: Build and publish to PyPI
     runs-on: ubuntu-latest

{eodag-3.4.1.post1 → eodag-3.4.2}/CHANGES.rst

@@ -3,6 +3,37 @@ Release history
 ===============
 
 
+v3.4.2 (2025-05-15)
+===================
+
+Bug Fixes
+---------
+
+* **core**: Remove quotes around arrays in query param (`#1657`_, `b717e45`_)
+
+* **plugins**: Adapt queryables additional_properties to providers config (`#1646`_, `cc6ecc9`_)
+
+* **plugins**: Add alias to properties in cop_marine and EcmwfSearch plugins (`#1649`_, `ae93d5a`_)
+
+* **plugins**: Ecmwfsearch orderable products search (`#1656`_, `a399a5b`_)
+
+Continuous Integration
+----------------------
+
+* Automatic deployment (`#1655`_, `4fbdf8b`_)
+
+.. _#1646: https://github.com/CS-SI/eodag/pull/1646
+.. _#1649: https://github.com/CS-SI/eodag/pull/1649
+.. _#1655: https://github.com/CS-SI/eodag/pull/1655
+.. _#1656: https://github.com/CS-SI/eodag/pull/1656
+.. _#1657: https://github.com/CS-SI/eodag/pull/1657
+.. _4fbdf8b: https://github.com/CS-SI/eodag/commit/4fbdf8ba4d2cece05bede65e18438ecdc8029a69
+.. _a399a5b: https://github.com/CS-SI/eodag/commit/a399a5b1d5457cdfcab355f8e2b4c440982ba65f
+.. _ae93d5a: https://github.com/CS-SI/eodag/commit/ae93d5a6c58476dad2461d9dde663aa31356dff9
+.. _b717e45: https://github.com/CS-SI/eodag/commit/b717e456fb23e59e9dfb6a99b5e30b697be73232
+.. _cc6ecc9: https://github.com/CS-SI/eodag/commit/cc6ecc9979bfee420ff75cd919c3f90ae73689bb
+
+
 v3.4.1 (2025-05-12)
 ===================
 

{eodag-3.4.1.post1/eodag.egg-info → eodag-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodag
-Version: 3.4.1.post1
+Version: 3.4.2
 Summary: Earth Observation Data Access Gateway
 Home-page: https://github.com/CS-SI/eodag
 Author: CS GROUP - France
@@ -317,7 +317,7 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm
 
 .. code-block:: bash
 
-    docker run -p 5000:5000 --rm csspace/eodag-server:3.4.1
+    docker run -p 5000:5000 --rm csspace/eodag-server:3.4.2
 
 You can also browse over your STAC API server using `STAC Browser <https://github.com/radiantearth/stac-browser>`_.
 Simply run:

{eodag-3.4.1.post1 → eodag-3.4.2}/README.rst

@@ -187,7 +187,7 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm
 
 .. code-block:: bash
 
-    docker run -p 5000:5000 --rm csspace/eodag-server:3.4.1
+    docker run -p 5000:5000 --rm csspace/eodag-server:3.4.2
 
 You can also browse over your STAC API server using `STAC Browser <https://github.com/radiantearth/stac-browser>`_.
 Simply run:

{eodag-3.4.1.post1 → eodag-3.4.2}/charts/eodag-server/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.4.1
+appVersion: 3.4.2
 dependencies:
 - name: common
   repository:  oci://registry-1.docker.io/bitnamicharts
@@ -15,4 +15,4 @@ name: eodag-server
 sources:
 - https://github.com/CS-SI/eodag
 type: application
-version: 3.4.1
+version: 3.4.2

{eodag-3.4.1.post1 → eodag-3.4.2}/docs/stac_rest.rst

@@ -115,7 +115,7 @@ available on `https://hub.docker.com/r/csspace/eodag-server <https://hub.docker.
 
 .. code-block:: bash
 
-    $ docker run -p 5000:5000 --rm csspace/eodag-server:3.4.1
+    $ docker run -p 5000:5000 --rm csspace/eodag-server:3.4.2
 
 Example
 -------

{eodag-3.4.1.post1 → eodag-3.4.2}/eodag/api/product/metadata_mapping.py

@@ -49,6 +49,7 @@ from eodag.utils import (
     get_timestamp,
     items_recursive_apply,
     nested_pairs2dict,
+    remove_str_array_quotes,
     sanitize,
     string_to_jsonpath,
     update_nested_dict,
@@ -1317,6 +1318,10 @@ def format_query_params(
                     # retrieve values from hashes where keys are given in the param
                     if "}[" in formatted_query_param:
                         formatted_query_param = _resolve_hashes(formatted_query_param)
+                    # remove quotes around arrays
+                    formatted_query_param = remove_str_array_quotes(
+                        formatted_query_param
+                    )
                     # json query string (for POST request)
                     update_nested_dict(
                         query_params,

{eodag-3.4.1.post1 → eodag-3.4.2}/eodag/plugins/search/base.py

@@ -369,6 +369,9 @@ class Search(PluginTopic):
             if not product_type
             else ""
         )
+        discover_metadata = getattr(self.config, "discover_metadata", {})
+        auto_discovery = discover_metadata.get("auto_discovery", False)
+
         if product_type or getattr(self.config, "discover_queryables", {}).get(
             "fetch_url", ""
         ):
@@ -376,6 +379,7 @@ class Search(PluginTopic):
                 self.config.product_type_config = product_type_configs[product_type]
             queryables = self._get_product_type_queryables(product_type, alias, filters)
             queryables.additional_information = additional_info
+            queryables.additional_properties = auto_discovery
 
             return queryables
         else:
@@ -390,7 +394,7 @@ class Search(PluginTopic):
                     Queryables.model_fields.get(k, Field(None)), "default", None
                 )
             return QueryablesDict(
-                additional_properties=True,
+                additional_properties=auto_discovery,
                 additional_information=additional_info,
                 **all_queryables,
             )

{eodag-3.4.1.post1 → eodag-3.4.2}/eodag/plugins/search/build_search_result.py

@@ -470,7 +470,7 @@ class ECMWFSearch(PostJsonSearch):
         self.config.__dict__.setdefault(
             "discover_metadata",
             {
-                "auto_discovery": True,
+                "auto_discovery": False,
                 "search_param": "{metadata}",
                 "metadata_pattern": "^[a-zA-Z0-9][a-zA-Z0-9_]*$",
             },
@@ -1179,6 +1179,9 @@ class ECMWFSearch(PostJsonSearch):
                 + "_ORDERABLE_"
                 + query_hash
             )
+            # use product_type_config as default properties
+            product_type_config = getattr(self.config, "product_type_config", {})
+            properties = dict(product_type_config, **properties)
 
         qs = geojson.dumps(sorted_unpaginated_qp)
 
@@ -1222,6 +1225,9 @@ def _check_id(product: EOProduct) -> EOProduct:
     if not (product_id := product.search_kwargs.get("id")):
         return product
 
+    if "ORDERABLE" in product_id:
+        return product
+
     on_response_mm = getattr(product.downloader.config, "order_on_response", {}).get(
         "metadata_mapping", {}
     )
@@ -1442,6 +1448,9 @@ class MeteoblueSearch(ECMWFSearch):
             productType=product_type,
             properties=properties,
         )
+        # use product_type_config as default properties
+        product_type_config = getattr(self.config, "product_type_config", {})
+        product.properties = dict(product_type_config, **product.properties)
 
         return [
             product,

{eodag-3.4.1.post1 → eodag-3.4.2}/eodag/plugins/search/cop_marine.py

@@ -285,6 +285,9 @@ class CopMarineSearch(StaticStacSearch):
             }
         }
         product = EOProduct(self.provider, properties, productType=product_type)
+        # use product_type_config as default properties
+        product_type_config = getattr(self.config, "product_type_config", {})
+        product.properties = dict(product_type_config, **product.properties)
         product.assets = AssetsDict(product, assets)
         return product