eotdl 2025.2.10__py3-none-any.whl → 2025.3.25__py3-none-any.whl

eotdl/__init__.py

@@ -1 +1 @@
-__version__ = "2025.02.10"
+__version__ = "2025.03.25"

eotdl/access/download.py

@@ -42,9 +42,8 @@ def download_sentinel_imagery(
         bulk = False
     else:
         bulk = True
-
-    data = client.download_data(requests_list)
-    imagery_from_tmp_to_dir(output, client.tmp_dir, name=name, bulk=bulk)
+    client.download_data(requests_list)
+    imagery_from_tmp_to_dir(output, name=name, bulk=bulk)
 
 
 def search_and_download_sentinel_imagery(

eotdl/access/sentinelhub/client.py

@@ -15,7 +15,6 @@ from sentinelhub import (
     SentinelHubDownloadClient,
     MimeType,
 )
-import uuid
 
 from ...repos.AuthRepo import AuthRepo
 from .parameters import SHParameters
@@ -58,7 +57,7 @@ class SHClient:
                     self.config.sh_client_id = creds["SH_CLIENT_ID"]
                     self.config.sh_client_secret = creds["SH_CLIENT_SECRET"]
         self.catalog = SentinelHubCatalog(config=self.config)
-        self.tmp_dir = "/tmp/sentinelhub/" + str(uuid.uuid4())
+        self.tmp_dir = "/tmp/sentinelhub"
 
     def search_data(
         self, bounding_box: list, time_interval: list, parameters: SHParameters
@@ -110,4 +109,5 @@ class SHClient:
             requests = [requests]
         download_requests = [request.download_list[0] for request in requests]
         data = download_client.download(download_requests)
+
         return data

eotdl/access/sentinelhub/utils.py

@@ -50,7 +50,7 @@ def evaluate_sentinel_parameters(
 
 def imagery_from_tmp_to_dir(
     output_dir: str,
-    tmp_dir: Optional[str],
+    tmp_dir: Optional[str] = "/tmp/sentinelhub",
     name: Optional[str] = None,
     bulk: Optional[bool] = False,
 ) -> None:
@@ -60,7 +60,9 @@ def imagery_from_tmp_to_dir(
     downloaded_files = glob(f"{tmp_dir}/**/response.tiff")
     if len(downloaded_files) == 0:
         return
+
     makedirs(output_dir, exist_ok=True)
+
     for downloaded_file in downloaded_files:
         request_json = downloaded_file.replace("response.tiff", "request.json")
         metadata = generate_raster_metadata(downloaded_file, request_json)
@@ -73,9 +75,11 @@ def imagery_from_tmp_to_dir(
                 output_filename = f"{metadata['type']}_{metadata['acquisition-date']}"
             else:
                 output_filename = metadata["type"]
+
         copyfile(downloaded_file, f"{output_dir}/{output_filename}.tif")
         with open(f"{output_dir}/{output_filename}.json", "w", encoding="utf-8") as f:
             json.dump(metadata, f)
+
     rmtree(tmp_dir)
 
 

eotdl/cli.py

@@ -1,7 +1,7 @@
 import typer
 import os
 
-from .commands import auth, datasets, models
+from .commands import auth, datasets, models, stac
 from .repos import APIRepo
 from . import __version__
 
@@ -10,7 +10,7 @@ app = typer.Typer(help="Welcome to EOTDL. Learn more at https://www.eotdl.com/")
 app.add_typer(auth.app, name="auth")
 app.add_typer(datasets.app, name="datasets")
 app.add_typer(models.app, name="models")
-
+app.add_typer(stac.app, name="stac")
 
 @app.command()
 def version():

eotdl/commands/datasets.py

@@ -4,39 +4,11 @@ from pathlib import Path
 from ..datasets import (
     retrieve_datasets,
     ingest_dataset,
-    download_dataset,
+    stage_dataset,
 )
 
 app = typer.Typer(help="Explore, ingest and download training datasets.")
 
-
-@app.command()
-def list(
-    name: str = typer.Option(
-        None, "--name", "-n", help="Filter the returned datasets by name"
-    ),
-    limit: int = typer.Option(
-        None, "--limit", "-l", help="Limit the number of returned results"
-    ),
-):
-    """
-    Retrieve a list with all the datasets in the EOTDL.
-
-    If using --name, it will filter the results by name. If no name is provided, it will return all the datasets.\n
-    If using --limit, it will limit the number of results. If no limit is provided, it will return all the datasets.
-    \n\n
-    Examples\n
-    --------\n
-    $ eotdl datasets list\n
-    $ eotdl datasets list --name YourModel --limit 5
-    """
-    try:
-        datasets = retrieve_datasets(name, limit)
-        typer.echo(datasets)
-    except Exception as e:
-        typer.echo(e)
-
-
 @app.command()
 def ingest(
     path: Path = typer.Option(
@@ -62,7 +34,7 @@ def ingest(
     ),
 ):
     """
-    Ingest a dataset to the EOTDL.
+    Ingest a dataset to the EOTDL.asdf
 
     This command ingests the dataset to the EOTDL. The dataset must be a folder with the dataset files,
     and at least a README.md file (and a catalog.json file for Q1+). If these files are missing, the ingestion
@@ -90,7 +62,32 @@ def ingest(
         ingest_dataset(path, verbose, typer.echo, foce_metadata_update, sync_metadata)
     except Exception as e:
         typer.echo(e)
+        
+@app.command()
+def list(
+    name: str = typer.Option(
+        None, "--name", "-n", help="Filter the returned datasets by name"
+    ),
+    limit: int = typer.Option(
+        None, "--limit", "-l", help="Limit the number of returned results"
+    ),
+):
+    """
+    Retrieve a list with all the datasets in the EOTDL.
 
+    If using --name, it will filter the results by name. If no name is provided, it will return all the datasets.\n
+    If using --limit, it will limit the number of results. If no limit is provided, it will return all the datasets.
+    \n\n
+    Examples\n
+    --------\n
+    $ eotdl datasets list\n
+    $ eotdl datasets list --name YourModel --limit 5
+    """
+    try:
+        datasets = retrieve_datasets(name, limit)
+        typer.echo(datasets)
+    except Exception as e:
+        typer.echo(e)
 
 @app.command()
 def get(
@@ -130,7 +127,7 @@ def get(
     $ eotdl dataset get YourDataset --path /path/to/download --file dataset.zip --version 1 --assets True --force True --verbose True
     """
     try:
-        dst_path = download_dataset(
+        dst_path = stage_dataset(
             dataset,
             version,
             path,

eotdl/commands/models.py

@@ -4,39 +4,11 @@ from pathlib import Path
 from ..models import (
     retrieve_models,
     ingest_model,
-    download_model,
+    stage_model,
 )
 
 app = typer.Typer(help="Explore, ingest and download ML models.")
 
-
-@app.command()
-def list(
-    name: str = typer.Option(
-        None, "--name", "-n", help="Filter the returned models by name"
-    ),
-    limit: int = typer.Option(
-        None, "--limit", "-l", help="Limit the number of returned results"
-    ),
-):
-    """
-    Retrieve a list with all the models in the EOTDL.
-
-    If using --name, it will filter the results by name. If no name is provided, it will return all the models.\n
-    If using --limit, it will limit the number of results. If no limit is provided, it will return all the models.
-    \n\n
-    Examples\n
-    --------\n
-    $ eotdl models list\n
-    $ eotdl models list --name YourModel --limit 5
-    """
-    try:
-        models = retrieve_models(name, limit)
-        typer.echo(models)
-    except Exception as e:
-        typer.echo(e)
-
-
 @app.command()
 def ingest(
     path: Path = typer.Option(..., "--path", "-p", help="Path to the model to ingest"),
@@ -88,6 +60,31 @@ def ingest(
     except Exception as e:
         typer.echo(e)
 
+@app.command()
+def list(
+    name: str = typer.Option(
+        None, "--name", "-n", help="Filter the returned models by name"
+    ),
+    limit: int = typer.Option(
+        None, "--limit", "-l", help="Limit the number of returned results"
+    ),
+):
+    """
+    Retrieve a list with all the models in the EOTDL.
+
+    If using --name, it will filter the results by name. If no name is provided, it will return all the models.\n
+    If using --limit, it will limit the number of results. If no limit is provided, it will return all the models.
+    \n\n
+    Examples\n
+    --------\n
+    $ eotdl models list\n
+    $ eotdl models list --name YourModel --limit 5
+    """
+    try:
+        models = retrieve_models(name, limit)
+        typer.echo(models)
+    except Exception as e:
+        typer.echo(e)
 
 @app.command()
 def get(
@@ -127,7 +124,7 @@ def get(
     $ eotdl models get YourModel --path /path/to/download --file model.zip --version 1 --assets True --force True --verbose True
     """
     try:
-        dst_path = download_model(
+        dst_path = stage_model(
             model, version, path, typer.echo, assets, force, verbose
         )
         typer.echo(f"Data available at {dst_path}")

eotdl/commands/stac.py

@@ -0,0 +1,57 @@
+import typer
+from typing import Optional
+
+from ..curation.stac.api import api_status, search_stac_columns, retrieve_stac_collections, retrieve_stac_collection, retrieve_stac_items, retrieve_stac_item, search_stac_items
+
+app = typer.Typer(help="EOTDL STAC API")
+
+@app.command()
+def status():
+    try:
+        data = api_status()
+        typer.echo(data)
+    except Exception as e:
+        typer.echo(e)
+        raise typer.Abort()
+
+@app.command()
+def collections():
+    try:
+        data = retrieve_stac_collections()
+        typer.echo(data)
+    except Exception as e:
+        typer.echo(e)
+        raise typer.Abort()
+    
+@app.command()
+def collection(collection_id: str):
+    try:
+        data = retrieve_stac_collection(collection_id)
+        typer.echo(data)
+    except Exception as e:
+        typer.echo(e)
+        raise typer.Abort()
+    
+@app.command()
+def items(collection_id: str):
+    try:
+        data = retrieve_stac_items(collection_id)
+        typer.echo(data)
+    except Exception as e:
+        typer.echo(e)
+
+@app.command()
+def item(collection_id: str, item_id: str):
+    try:
+        data = retrieve_stac_item(collection_id, item_id)
+        typer.echo(data)
+    except Exception as e:
+        typer.echo(e)
+
+@app.command()
+def search(collection_id: str, query: Optional[str] = None):
+    try:
+        data = search_stac_items(collection_id, query)
+        typer.echo(data)
+    except Exception as e:
+        typer.echo(e)

eotdl/curation/__init__.py

@@ -1,8 +0,0 @@
-"""
-Curation module
-"""
-
-from .stac.dataframe import STACDataFrame  # , read_stac
-from .stac.stac import STACGenerator
-from .stac.parsers import STACIdParser, StructuredParser, UnestructuredParser
-from .stac.dataframe_labeling import UnlabeledStrategy, LabeledStrategy

eotdl/curation/stac/__init__.py

@@ -1,8 +1 @@
-"""
-STAC module
-"""
-
-# from .stac import STACGenerator
-# from .utils import format_time_acquired
-# from .parsers import STACIdParser, StructuredParser, UnestructuredParser
-from .dataframe import STACDataFrame, read_stac
+from .stac import create_stac_catalog

eotdl/curation/stac/api.py

@@ -0,0 +1,58 @@
+import json
+
+from ...repos import STACAPIRepo
+
+def api_status():
+    repo = STACAPIRepo()
+    data, error = repo.status()
+    if error:
+        raise Exception(error)
+    return data
+
+def retrieve_stac_collections():
+    repo = STACAPIRepo()
+    data, error = repo.collections()
+    if error:
+        raise Exception(error)
+    return data
+
+def retrieve_stac_collection(collection_id):
+    repo = STACAPIRepo()
+    data, error = repo.collection(collection_id)
+    if error:
+        raise Exception(error)
+    return data
+
+def retrieve_stac_items(collection_id):
+    repo = STACAPIRepo()
+    data, error = repo.items(collection_id)
+    if error:
+        raise Exception(error)
+    return data
+
+def retrieve_stac_item(collection_id, item_id):
+    repo = STACAPIRepo()
+    data, error = repo.item(collection_id, item_id)
+    if error:
+        raise Exception(error)
+    return data
+
+def search_stac_items(collection_id, query = None):
+    repo = STACAPIRepo()
+    if query is None:
+        data, error = repo.search_columns(collection_id)
+        if error:
+            raise Exception(error)
+        return data
+    data, error = repo.search(collection_id, str(query))
+    if error:
+        raise Exception(error)
+    return json.loads(data)
+    
+
+def search_stac_columns(collection_id):
+    repo = STACAPIRepo()
+    data, error = repo.search_columns(collection_id)
+    if error:
+        raise Exception(error)
+    return data