cdsetool 0.2.3__tar.gz → 0.2.4__tar.gz

{cdsetool-0.2.3/src/cdsetool.egg-info → cdsetool-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdsetool
-Version: 0.2.3
+Version: 0.2.4
 Summary: Tools & CLI for interacting with CDSE product APIs
 Author-email: Jacob Vejby <javej@sdfi.dk>
 Project-URL: Homepage, https://github.com/SDFIdk/CDSETool
@@ -15,9 +15,9 @@ Requires-Dist: rich<13.8,>=13.6
 Requires-Dist: requests<2.32.0,>=2.28.1
 Requires-Dist: pyjwt[crypto]~=2.8.0
 Provides-Extra: test
-Requires-Dist: black==23.11.0; extra == "test"
-Requires-Dist: pylint==3.0.2; extra == "test"
-Requires-Dist: pytest==7.4.3; extra == "test"
+Requires-Dist: black==24.1.1; extra == "test"
+Requires-Dist: pylint==3.0.3; extra == "test"
+Requires-Dist: pytest==8.0.0; extra == "test"
 Requires-Dist: pytest-cov==4.1.0; extra == "test"
 Requires-Dist: requests-mock==1.11.0; extra == "test"
 Requires-Dist: pytest-mock==3.12.0; extra == "test"
@@ -97,7 +97,7 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
 Install `cdsetool` using pip:
 
 ```bash
-pip install cdsetool==0.2.3
+pip install cdsetool==0.2.4
 ```
 
 ## Usage

{cdsetool-0.2.3 → cdsetool-0.2.4}/README.md

@@ -71,7 +71,7 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
 Install `cdsetool` using pip:
 
 ```bash
-pip install cdsetool==0.2.3
+pip install cdsetool==0.2.4
 ```
 
 ## Usage

{cdsetool-0.2.3 → cdsetool-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdsetool"
-version = "0.2.3"
+version = "0.2.4"
 authors = [
   { name="Jacob Vejby", email="javej@sdfi.dk" },
 ]
@@ -23,9 +23,9 @@ dependencies = [
 ]
 [project.optional-dependencies]
 test = [
-    "black==23.11.0",
-    "pylint==3.0.2",
-    "pytest==7.4.3",
+    "black==24.1.1",
+    "pylint==3.0.3",
+    "pytest==8.0.0",
     "pytest-cov==4.1.0",
     "requests-mock==1.11.0",
     "pytest-mock==3.12.0",

{cdsetool-0.2.3 → cdsetool-0.2.4}/src/cdsetool/_processing.py

@@ -1,6 +1,7 @@
 """
 This module provides functions for processing data concurrently
 """
+
 from concurrent.futures import wait, FIRST_COMPLETED
 from concurrent.futures import ThreadPoolExecutor
 

{cdsetool-0.2.3 → cdsetool-0.2.4}/src/cdsetool/cli.py

@@ -1,6 +1,7 @@
 """
 Command line interface
 """
+
 import os
 import sys
 import json as JSON
@@ -76,6 +77,9 @@ def download(
     concurrency: Annotated[
         int, typer.Option(help="Number of concurrent connections")
     ] = 1,
+    overwrite_existing: Annotated[
+        bool, typer.Option(help="Overwrite already downloaded files")
+    ] = False,
     search_term: Annotated[
         Optional[List[str]],
         typer.Option(
@@ -97,7 +101,13 @@ def download(
 
     list(
         download_features(
-            features, path, {"monitor": StatusMonitor(), "concurrency": concurrency}
+            features,
+            path,
+            {
+                "monitor": StatusMonitor(),
+                "concurrency": concurrency,
+                "overwrite_existing": overwrite_existing,
+            },
         )
     )
 

{cdsetool-0.2.3 → cdsetool-0.2.4}/src/cdsetool/credentials.py

@@ -2,6 +2,7 @@
 This module provides a class for handling credentials for
 the Copernicus Identity and Access Management (IAM) system.
 """
+
 from datetime import datetime, timedelta
 import netrc
 import threading

{cdsetool-0.2.3 → cdsetool-0.2.4}/src/cdsetool/download.py

@@ -4,6 +4,7 @@ Download features from a Copernicus Data Space Ecosystem OpenSearch API result
 Provides a function to download a single feature, and a function to download
 all features in a result set.
 """
+
 import os
 import random
 import tempfile
@@ -27,8 +28,12 @@ def download_feature(feature, path, options=None):
     if not url or not filename:
         return feature.get("id")
 
-    # if os.path.exists(file):
-    #     return feature.get("id")
+    overwrite = options.get("overwrite_existing", False)
+
+    result_path = os.path.join(path, filename.replace(".SAFE", ".zip"))
+
+    if not overwrite and os.path.exists(result_path):
+        return feature.get("id")
 
     with _get_monitor(options).status() as status:
         status.set_filename(filename)
@@ -51,7 +56,7 @@ def download_feature(feature, path, options=None):
                 status.add_progress(len(chunk))
 
         os.close(fd)
-        shutil.move(tmp, os.path.join(path, filename.replace(".SAFE", ".zip")))
+        shutil.move(tmp, result_path)
 
     return feature.get("id")
 

{cdsetool-0.2.3 → cdsetool-0.2.4}/src/cdsetool/monitor.py

@@ -7,6 +7,7 @@ progress of file downloads.
 For non-interactive programs the NoopMonitor class can be used to disable
 status monitoring.
 """
+
 import time
 import threading
 import sys

{cdsetool-0.2.3 → cdsetool-0.2.4}/src/cdsetool/query.py

@@ -3,6 +3,7 @@ Query the Copernicus Data Space Ecosystem OpenSearch API
 
 https://documentation.dataspace.copernicus.eu/APIs/OpenSearch.html
 """
+
 from xml.etree import ElementTree
 from datetime import datetime, date
 import re
@@ -114,6 +115,8 @@ def geojson_to_wkt(geojson):
 
     if geojson.get("type") == "Feature":
         geojson = geojson["geometry"]
+    elif geojson.get("type") == "FeatureCollection" and len(geojson["features"]) == 1:
+        geojson = geojson["features"][0]["geometry"]
 
     coordinates = str(
         tuple(item for sublist in geojson["coordinates"][0] for item in sublist)

{cdsetool-0.2.3 → cdsetool-0.2.4/src/cdsetool.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cdsetool
-Version: 0.2.3
+Version: 0.2.4
 Summary: Tools & CLI for interacting with CDSE product APIs
 Author-email: Jacob Vejby <javej@sdfi.dk>
 Project-URL: Homepage, https://github.com/SDFIdk/CDSETool
@@ -15,9 +15,9 @@ Requires-Dist: rich<13.8,>=13.6
 Requires-Dist: requests<2.32.0,>=2.28.1
 Requires-Dist: pyjwt[crypto]~=2.8.0
 Provides-Extra: test
-Requires-Dist: black==23.11.0; extra == "test"
-Requires-Dist: pylint==3.0.2; extra == "test"
-Requires-Dist: pytest==7.4.3; extra == "test"
+Requires-Dist: black==24.1.1; extra == "test"
+Requires-Dist: pylint==3.0.3; extra == "test"
+Requires-Dist: pytest==8.0.0; extra == "test"
 Requires-Dist: pytest-cov==4.1.0; extra == "test"
 Requires-Dist: requests-mock==1.11.0; extra == "test"
 Requires-Dist: pytest-mock==3.12.0; extra == "test"
@@ -97,7 +97,7 @@ cdsetool download Sentinel2 PATH/TO/DIR --concurrency 4 --search-term startDate=
 Install `cdsetool` using pip:
 
 ```bash
-pip install cdsetool==0.2.3
+pip install cdsetool==0.2.4
 ```
 
 ## Usage

{cdsetool-0.2.3 → cdsetool-0.2.4}/src/cdsetool.egg-info/requires.txt

@@ -7,9 +7,9 @@ pyjwt[crypto]~=2.8.0
 geopandas==0.13.2
 
 [test]
-black==23.11.0
-pylint==3.0.2
-pytest==7.4.3
+black==24.1.1
+pylint==3.0.3
+pytest==8.0.0
 pytest-cov==4.1.0
 requests-mock==1.11.0
 pytest-mock==3.12.0