fixed minor issues in assets

FREVA-CLINT · Feb 5, 2025 · 5f09aa0 · 5f09aa0
1 parent 72468c8
commit 5f09aa0
Showing 1 changed file with 27 additions and 26 deletions.
diff --git a/freva-rest/src/freva_rest/databrowser_api/core.py b/freva-rest/src/freva_rest/databrowser_api/core.py
@@ -1846,6 +1846,27 @@ async def _create_stac_item(self, result: Dict[str, Any]) -> pystac.Item:
         --------
             pystac.Item: Created STAC item
         """
+        id = result.get(self.uniq_key, "")
+        params_dict = (
+            ast.literal_eval(str(self.assets_prereqs.get("only_params")))
+            if self.assets_prereqs.get("only_params", "")
+            else {}
+        )
+        python_params = " ".join(
+            f"{k}={v},"
+            for k, v in params_dict.items()
+            if k not in ("translate", "stac_dynamic", "start")
+        )
+
+        cli_params = " ".join(
+            f"{k}={v}" for k, v in params_dict.items()
+            if k not in ("translate", "stac_dynamic", "start")
+        )
+
+        api_params = "&".join(
+            f"{k}={v}" for k, v in params_dict.items()
+            if k not in ("translate", "stac_dynamic", "start")
+        )
         intake_desc = dedent(
             f"""
             # Installing Intake-ESM
@@ -1863,32 +1884,12 @@ async def _create_stac_item(self, result: Dict[str, Any]) -> pystac.Item:
                 str(self.assets_prereqs.get("full_endpoint")).replace(
                     "stac-catalogue",
                     "intake-catalogue"
-                )
+                ) + f"&{self.uniq_key}={id}"
             }')
             ```
             """
         )
-        id = result.get(self.uniq_key, "")
-        params_dict = (
-            ast.literal_eval(str(self.assets_prereqs.get("only_params")))
-            if self.assets_prereqs.get("only_params", "")
-            else {}
-        )
-        python_params = " ".join(
-            f"{k}={v},"
-            for k, v in params_dict.items()
-            if k not in ("translate", "stac_dynamic", "start")
-        )
-
-        cli_params = " ".join(
-            f"{k}={v}" for k, v in params_dict.items()
-            if k not in ("translate", "stac_dynamic", "start")
-        )
 
-        api_params = "&".join(
-            f"{k}={v}" for k, v in params_dict.items()
-            if k not in ("translate", "stac_dynamic", "start")
-        )
         zarr_desc = dedent(
             f"""
             # Accessing Zarr Data
@@ -1918,7 +1919,7 @@ async def _create_stac_item(self, result: Dict[str, Any]) -> pystac.Item:
             curl -X GET {self.assets_prereqs.get('base_url')}api/ \\
             freva-nextgen/databrowser/load/\\
             {self.translator.flavour}?{api_params}\\
-            {self.uniq_key}={id} \\
+            &{self.uniq_key}={id} \\
               -H "Authorization: Bearer YOUR_ACCESS_TOKEN"
             ```
             💡: Read more about the
@@ -2002,7 +2003,7 @@ async def _create_stac_item(self, result: Dict[str, Any]) -> pystac.Item:
                 href=(
                     f"{self.assets_prereqs.get('base_url')}databrowser/?"
                     f"{api_params}"
-                    f"{self.uniq_key}={id}"
+                    f"&{self.uniq_key}={id}"
                 ),
                 title="Freva Web DataBrowser",
                 description=(
@@ -2016,7 +2017,7 @@ async def _create_stac_item(self, result: Dict[str, Any]) -> pystac.Item:
                     str(self.assets_prereqs.get("full_endpoint")).replace(
                         "stac-catalogue", "intake-catalogue"
                     )
-                    + f"{self.uniq_key}={id}"
+                    + f"&{self.uniq_key}={id}"
                 ),
                 title="Intake Catalogue",
                 description=intake_desc,
@@ -2027,7 +2028,7 @@ async def _create_stac_item(self, result: Dict[str, Any]) -> pystac.Item:
                 href=(
                     f"{self.assets_prereqs.get('base_url')}api/freva-nextgen/"
                     f"databrowser/load/{self.translator.flavour}?"
-                    f"{api_params}{self.uniq_key}={id}"
+                    f"{api_params}&{self.uniq_key}={id}"
                 ),
                 title="Stream Zarr Data",
                 description=zarr_desc,
@@ -2049,7 +2050,7 @@ async def _create_stac_item(self, result: Dict[str, Any]) -> pystac.Item:
                     f"databrowser/data-search/{self.translator.flavour}/"
                     f"{self.uniq_key}?"
                     f"{api_params}"
-                    f"{self.uniq_key}={id}"
+                    f"&{self.uniq_key}={id}"
                 ),
                 title="Access data locally",
                 description=local_access_desc,