Merge branch 'main' into plausible-integration

README.md

@@ -53,7 +53,7 @@ cd eoAPI
 docker compose up
 ```
 
-Once the applications are *up*, you'll need to add STAC **Collections** and **Items** to the PgSTAC database. If you don't have, you can use the follow the [MAXAR open data demo](https://github.com/vincentsarago/MAXAR_opendata_to_pgstac) (or get inspired by the other [demos](https://github.com/developmentseed/eoAPI/tree/main/demo)).
+Once the applications are *up*, you'll need to add STAC **Collections** and **Items** to the PgSTAC database. If you don't have these available, you can follow the [MAXAR open data demo](https://github.com/vincentsarago/MAXAR_opendata_to_pgstac) (or get inspired by the other [demos](https://github.com/developmentseed/eoAPI/tree/main/demo)).
 
 Then you can start exploring your dataset with:
 
@@ -71,7 +71,7 @@ This repository has current runtimes that are consistently updated with new func
 
 The services can be deployed altogether locally with `docker compose up`.
 
-Alternatively, you may install the libraries and launch the applications manually : 
+Alternatively, you may install the libraries and launch the applications manually: 
 
 <details>
 
@@ -104,7 +104,7 @@ python -m pip install tipg
 .venv/bin/uvicorn tipg.main:app --port 8083 --reload
 ```
 
-Note: python libraries might have incompatible dependencies, which you can resolve by using a virtual environment for each ones
+Note: Python libraries might have incompatible dependencies, which you can resolve by using a virtual environment for each one.
 
 </details>
 
@@ -124,7 +124,7 @@ Note: python libraries might have incompatible dependencies, which you can resol
 
 The eoAPI repository hosts customized versions of each base service which can work in parallel or in combination with each other.
 
-eoAPI custom runtimes can be launched with docker
+eoAPI custom runtimes can be launched with docker:
 
 ```
 docker compose -f docker-compose.custom.yml --profile gunicorn up
@@ -144,7 +144,7 @@ export DATABASE_URL=postgresql://username:[email protected]:5439/postgis  # Conne
 .venv/bin/uvicorn eoapi.{SERVICE}.app:app --port 8000 --reload
 ```
 
-Note: services might have incompatible dependencies, which you can resolve by using a virtual environment for each service
+Note: services might have incompatible dependencies, which you can resolve by using a virtual environment for each service.
 
 ## Contribution & Development
 

demo/Maxar/eoAPI_Maxar_demo.ipynb

@@ -68,7 +68,7 @@
    },
    "outputs": [],
    "source": [
-    "!python -m pip install pypgstac==0.8.1"
+    "!python -m pip install \"pypgstac[psycopg]==0.8.1\""
    ]
   },
   {
@@ -79,7 +79,7 @@
    "outputs": [],
    "source": [
     "# Download the collections file\n",
-    "!curl https://raw.githubusercontent.com/vincentsarago/MAXAR_opendata_to_pgstac/main/collections_assets.json > collections.json"
+    "!wget https://github.com/vincentsarago/MAXAR_opendata_to_pgstac/raw/main/Maxar/collections.json"
    ]
   },
   {
@@ -90,7 +90,7 @@
    "outputs": [],
    "source": [
     "# Download the items file\n",
-    "!curl https://raw.githubusercontent.com/vincentsarago/MAXAR_opendata_to_pgstac/main/items_s3.json > items.json"
+    "! wget https://github.com/vincentsarago/MAXAR_opendata_to_pgstac/raw/main/Maxar/items.json.zip && unzip items.json.zip && rm -rf items.json.zip"
    ]
   },
   {
@@ -103,7 +103,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 10,
    "id": "af16cb95",
    "metadata": {},
    "outputs": [],
@@ -114,7 +114,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 11,
    "id": "f7ded3bc",
    "metadata": {
     "scrolled": true
@@ -134,24 +134,12 @@
     "\n",
     "See https://github.com/stac-utils/pgstac/blob/main/docs/src/pgstac.md#pgstac-settings-variables\n",
     "\n",
-    "The PgSTAC Context extension is not enabled by default because it's \"slows\" down the `/search` request but for this Demo we want it enabled.\n",
-    "\n",
-    "**Requirements**: `psycopg[binary]`"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "11c68484",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "!python -m pip install psycopg[binary]"
+    "The PgSTAC Context extension is not enabled by default because it's \"slows\" down the `/search` request but for this Demo we want it enabled."
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 12,
    "id": "dc3fa136",
    "metadata": {},
    "outputs": [],
@@ -1039,7 +1027,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.17"
+   "version": "3.11.7"
   }
  },
  "nbformat": 4,