From c662f0b7f8983dfc8a23a9d18e4e8aa9d591e1c9 Mon Sep 17 00:00:00 2001 From: LudivineSchlegel <35892777+LudivineSchlegel@users.noreply.github.com> Date: Fri, 25 Aug 2023 09:38:09 +0200 Subject: [PATCH 1/5] generic_joincache.jsonc: ajout BBox WMTS pyramide1 --- ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc b/ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc index 24476906..ce69a7c2 100644 --- a/ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc +++ b/ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc @@ -70,7 +70,15 @@ "bottom_level": "18", "top_level": "5" } - ] + ], + // BBox obligatoire ici, sinon l'injection dans la pyramide1 ne sera pas visible + // BBox France métropolitaine + "bbox": { + "west": -4.82, + "south": 42.18, + "east": 8.71, + "north": 51.14 + } }, "getfeatureinfo": { "stored_data": true @@ -113,7 +121,7 @@ "configuration-WMST-pyramide1" ] }, - + // Étape n°4 : Création de pyramide raster 2 "pyramide2": { "actions": [ From 2bf1f13d126d5bedaa6f51b197cc5ee21316a8d9 Mon Sep 17 00:00:00 2001 From: LudivineSchlegel <35892777+LudivineSchlegel@users.noreply.github.com> Date: Fri, 25 Aug 2023 15:12:54 +0200 Subject: [PATCH 2/5] generic_joincache.jsonc: debug --- ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc b/ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc index ce69a7c2..bc928d73 100644 --- a/ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc +++ b/ignf_gpf_sdk/_data/workflows/generic_joincache.jsonc @@ -280,7 +280,7 @@ "processing": "{store_entity.processing.infos._id [INFOS(name=Calcul de pyramide raster)]}", "inputs": { "upload": [ - "store_entity.upload.infos._id [INFOS(name=EXAMPLE_DATASET_RASTER3)]}" + "{store_entity.upload.infos._id [INFOS(name=EXAMPLE_DATASET_RASTER3)]}" ] }, "output": { From 9f734989c7d12162cfb845f60c7d544d78449ef2 Mon Sep 17 00:00:00 2001 From: LudivineSchlegel <35892777+LudivineSchlegel@users.noreply.github.com> Date: Fri, 25 Aug 2023 15:16:05 +0200 Subject: [PATCH 3/5] OfferingAction: debug affichage URL --- ignf_gpf_sdk/workflow/action/OfferingAction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignf_gpf_sdk/workflow/action/OfferingAction.py b/ignf_gpf_sdk/workflow/action/OfferingAction.py index 6787aea1..f9872156 100644 --- a/ignf_gpf_sdk/workflow/action/OfferingAction.py +++ b/ignf_gpf_sdk/workflow/action/OfferingAction.py @@ -37,7 +37,7 @@ def run(self, datastore: Optional[str] = None) -> None: else: # si les url sont récupérées sous forme de liste s_urls = "\n - ".join(o_offering["urls"]) - Config().om.info(f"Offre créée : {self.__offering}\n{s_urls}") + Config().om.info(f"Offre créée : {self.__offering}\n - {s_urls}", green_colored=True) Config().om.info("Création d'une offre : terminé") def __create_offering(self, datastore: Optional[str]) -> None: From 34f7a6161c2139f3dd1727a2474fde5925eccc0a Mon Sep 17 00:00:00 2001 From: LudivineSchlegel <35892777+LudivineSchlegel@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:40:04 +0200 Subject: [PATCH 4/5] =?UTF-8?q?StoreEntity=20:=20debug=20api=5Flist=20(dat?= =?UTF-8?q?astore=20entit=C3=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ignf_gpf_sdk/io/DescriptorFileReader.py | 2 +- ignf_gpf_sdk/store/StoreEntity.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ignf_gpf_sdk/io/DescriptorFileReader.py b/ignf_gpf_sdk/io/DescriptorFileReader.py index 303827ae..6efcf321 100644 --- a/ignf_gpf_sdk/io/DescriptorFileReader.py +++ b/ignf_gpf_sdk/io/DescriptorFileReader.py @@ -39,7 +39,7 @@ def __init__(self, descriptor_file_path: Path) -> None: JsonHelper.validate_object( self.__descriptor_dict, d_schema, - "Fichier descriptif de livraison {json_path} non valide.", + f"Fichier descriptif de livraison {descriptor_file_path} non valide.", "Schéma du fichier descriptif de livraison non valide. Contactez le support.", ) diff --git a/ignf_gpf_sdk/store/StoreEntity.py b/ignf_gpf_sdk/store/StoreEntity.py index a64c49e8..709ce631 100644 --- a/ignf_gpf_sdk/store/StoreEntity.py +++ b/ignf_gpf_sdk/store/StoreEntity.py @@ -164,7 +164,7 @@ def api_list(cls: Type[T], infos_filter: Optional[Dict[str, str]] = None, tags_f params={**d_params, **{"page": i_page, "limit": i_limit}}, ) # On les ajoute à la liste - l_entities += [cls(i) for i in o_response.json()] + l_entities += [cls(i, datastore) for i in o_response.json()] # On regarde le Content-Range de la réponse pour savoir si on doit refaire une requête pour récupérer la fin b_next_page = ApiRequester.range_next_page(o_response.headers.get("Content-Range"), len(l_entities)) # On passe à la page suivante From 1304af4ad363c53a6c05c8014b32e8ebf8caced2 Mon Sep 17 00:00:00 2001 From: LudivineSchlegel <35892777+LudivineSchlegel@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:44:40 +0200 Subject: [PATCH 5/5] version 0.1.13 --- ignf_gpf_sdk/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignf_gpf_sdk/__init__.py b/ignf_gpf_sdk/__init__.py index f6da5d30..c0ade9a3 100644 --- a/ignf_gpf_sdk/__init__.py +++ b/ignf_gpf_sdk/__init__.py @@ -1,3 +1,3 @@ """Python API to simplify the use of the GPF HTTPS API.""" -__version__ = "0.1.11" +__version__ = "0.1.13"