Merge branch 'develop'

Author: sbrunato

CHANGES.md

@@ -1,5 +1,18 @@
 # Release history
 
+## v5.2.0 (2025-07-16)
+
+### Features
+
+- **settings**: Search count disabled by default
+  ([#247](https://github.com/CS-SI/eodag-labextension/pull/247),
+  [`883cb41`](https://github.com/CS-SI/eodag-labextension/commit/883cb41b4f95e11efba7174701f1a9b60554e456))
+
+### Bug Fixes
+
+- **settings**: Info fetch url ([#246](https://github.com/CS-SI/eodag-labextension/pull/246),
+  [`87894ab`](https://github.com/CS-SI/eodag-labextension/commit/87894ab85b3c7cf33cd879c33d3a7de2403a59e6))
+
 ## v5.1.0 (2025-06-24)
 
 ### Features

README.md

@@ -121,6 +121,8 @@ You will be enable to:
 - Configure Labextension through its settings:
 
   - choose whether newly inserted code should replace existing search code or not;
+  - enable search count, which would significantly slow down search requests for some providers, and might be
+    unavailable for some others;
   - configure the default map settings.
 
 - Edit [EODAG user configuration file](https://eodag.readthedocs.io/en/stable/getting_started_guide/configure.html#yaml-user-configuration-file),

eodag_labextension/handlers.py

@@ -406,7 +406,7 @@ async def post(self, product_type):
         if int(page) == DEFAULT_PAGE:
             # first search
             results_iterator = await current_loop.run_in_executor(
-                None, partial(dag.search_iter_page, productType=product_type, count=True, **arguments)
+                None, partial(dag.search_iter_page, productType=product_type, **arguments)
             )
         if results_iterator is None:
             raise ValidationError(

notebooks/images/eodag_labext_settings_map.png

@@ -1,6 +1,6 @@
 {
     "name": "eodag-labextension",
-    "version": "5.1.0",
+    "version": "5.2.0",
     "description": "Searching remote sensed imagery from various image providers",
     "keywords": [
         "jupyter",
@@ -14,7 +14,7 @@
     "license": "Apache-2.0",
     "author": {
         "name": "CS Group",
-        "email": "admin@geostorm.eu"
+        "email": "eodag@csgroup.space"
     },
     "files": [
         "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",

package.json

@@ -10,6 +10,12 @@
       "type": "boolean",
       "default": false
     },
+    "searchCount": {
+      "title": "Search count enable",
+      "description": "Enabling count will significantly slow down search requests for some providers, and might be unavailable for some others.",
+      "type": "boolean",
+      "default": false
+    },
     "map": {
       "title": "Map settings",
       "description": "Settings for editing the center and zoom of the map",

schema/plugin.json

@@ -119,7 +119,8 @@ export const EodagBrowser: React.FC<IEodagBrowserProps> = ({
     const idParam = params.find(p => p.key === 'id');
     const idValue = idParam?.value?.id;
 
-    const replaceCode = await getEodagSettings();
+    const settings = await getEodagSettings();
+    const replaceCode = settings.replaceCode;
     let input: IFormInput;
     if (isUndefined(formValues)) {
       input = {
@@ -145,7 +146,12 @@ export const EodagBrowser: React.FC<IEodagBrowserProps> = ({
         input = formValues as IFormInput;
       }
     }
-    insertCode(notebook, model, codeGenerator(input, replaceCode), replaceCode);
+    insertCode(
+      notebook,
+      model,
+      await codeGenerator(input, replaceCode),
+      replaceCode
+    );
   };
 
   return (

src/components/browser.tsx

@@ -20,8 +20,7 @@ export const useEodagSettings = () => {
         return res.json();
       })
       .then(data => {
-        const { replaceCode } = data.settings;
-        return replaceCode;
+        return data.settings;
       });
   };
 

src/hooks/useEodagSettings.ts

@@ -1,4 +1,7 @@
 import { useEffect, useState } from 'react';
+import { URLExt } from '@jupyterlab/coreutils';
+import { ServerConnection } from '@jupyterlab/services';
+import { EODAG_SERVER_ADDRESS } from '../config/config';
 import { IMapSettings } from '../components/browser';
 import { ICustomError } from '../types';
 import { showCustomErrorDialog } from '../components/customErrorDialog/customErrorDialog';
@@ -15,7 +18,12 @@ export const useEodagVersions = () => {
   useEffect(() => {
     const fetchInfo = async () => {
       try {
-        const res = await fetch('/eodag/info', {
+        const serverSettings = ServerConnection.makeSettings();
+        const eodagServer = URLExt.join(
+          serverSettings.baseUrl,
+          EODAG_SERVER_ADDRESS
+        );
+        const res = await fetch(URLExt.join(eodagServer, 'info'), {
           credentials: 'same-origin'
         });
 
@@ -32,9 +40,7 @@ export const useEodagVersions = () => {
         if (!res.ok) {
           throw {
             name: '',
-            title:
-              data?.error ||
-              'Erreur lors de la récupération des informations EODAG.',
+            title: data?.error || 'Error while fetching EODAG information',
             details: data?.details || ''
           };
         }
@@ -58,8 +64,7 @@ export const useEodagVersions = () => {
       } catch (error: any) {
         const customError: ICustomError = {
           name: '',
-          title:
-            error?.error || 'Erreur lors de la récupération des informations.',
+          title: error?.error || 'Error while fetching information.',
           details: error?.details || ''
         };
         await showCustomErrorDialog(

src/hooks/useEodagVersions.ts

@@ -9,14 +9,15 @@ import { geojsonToWKT } from '@terraformer/wkt';
 
 import { IFormInput } from '../types';
 import { isUndefined } from 'lodash';
+import { useEodagSettings } from '../hooks/useEodagSettings';
 
 const formatDate = (date: Date): string => {
   const local = new Date(date);
   local.setMinutes(date.getMinutes() - date.getTimezoneOffset());
   return local.toJSON().slice(0, 10);
 };
 
-export const codeGenerator = (
+export const codeGenerator = async (
   {
     startDate,
     endDate,
@@ -29,6 +30,10 @@ export const codeGenerator = (
   }: IFormInput,
   replaceCode: boolean
 ) => {
+  const { getEodagSettings } = useEodagSettings();
+  const settings = await getEodagSettings();
+  const searchCount = settings.searchCount;
+
   const start = startDate ? formatDate(startDate) : undefined;
   const end = endDate ? formatDate(endDate) : undefined;
   const tab = ' '.repeat(4);
@@ -75,6 +80,10 @@ search_results = dag.search(`;
     code += `
     id="${id}",`;
   }
+  if (searchCount === true) {
+    code += `
+    count=True,`;
+  }
   let filteredParameters: { name: string; value: string }[] = [];
   if (!isUndefined(additionalParameters)) {
     filteredParameters = additionalParameters.filter(