eotdl 2023.6.14.post8__py3-none-any.whl → 2023.6.14.post10__py3-none-any.whl

eotdl/auth/__init__.py

@@ -1 +1 @@
-from .main import is_logged, auth, generate_logout_url
+from .main import is_logged, auth, generate_logout_url, with_auth

eotdl/auth/main.py

@@ -1,7 +1,5 @@
 from ..src.repos import AuthRepo, APIRepo
-from ..src.usecases.auth.IsLogged import IsLogged
-from ..src.usecases.auth.Auth import Auth
-from ..src.usecases.auth.Logout import Logout
+from ..src.usecases.auth import IsLogged, Auth, Logout
 
 
 def is_logged():
@@ -31,3 +29,12 @@ def generate_logout_url():
     inputs = _logout.Inputs()
     outputs = _logout(inputs)
     return outputs.logout_url
+
+
+# auth decorator
+def with_auth(func):
+    def wrapper(*args, **kwargs):
+        user = auth()
+        return func(*args, **kwargs, user=user)
+
+    return wrapper

eotdl/commands/datasets.py

@@ -29,8 +29,7 @@ def get(name: str, path: str = None):
     path: Path to download the dataset to
     """
     try:
-        user = auth()
-        dst_path = download_dataset(name, path, user, typer.echo)
+        dst_path = download_dataset(name, path, typer.echo)
         typer.echo(f"Dataset {name} downloaded to {dst_path}")
     except Exception as e:
         typer.echo(e)
@@ -49,10 +48,9 @@ def ingest(
     n: Name of the dataset
     """
     try:
-        user = auth()
         # if p:
         #     ingest_large_dataset_parallel(name, path, user, p, typer.echo)
-        ingest_large_dataset(name, path, user, typer.echo)
+        ingest_large_dataset(name, path, typer.echo)
         typer.echo(f"Dataset {name} ingested")
     except Exception as e:
         typer.echo(e)
@@ -70,8 +68,7 @@ def update(
     path: Path to dataset to ingest
     """
     try:
-        user = auth()
-        update_dataset(name, path, user, typer.echo)
+        update_dataset(name, path, typer.echo)
         typer.echo(f"Dataset {name} updated")
     except Exception as e:
         typer.echo(e)

eotdl/datasets/__init__.py

@@ -1,4 +1,4 @@
 from .ingest import ingest_dataset, ingest_large_dataset, ingest_q0, ingest_q1
 from .download import download_dataset
-from .retrieve import retrieve_datasets, retrieve_dataset
+from .retrieve import retrieve_datasets, retrieve_dataset, list_datasets
 from .update import update_dataset

eotdl/datasets/download.py

@@ -1,9 +1,11 @@
 from ..src.repos import APIRepo
-from ..src.usecases.datasets.DownloadDataset import DownloadDataset
+from ..src.usecases.datasets import DownloadDataset
 from .retrieve import retrieve_dataset
+from ..auth import with_auth
 
 
-def download_dataset(name, path, user, logger):
+@with_auth
+def download_dataset(name, path=None, logger=None, user=None):
     dataset = retrieve_dataset(name)
     dataset_id = dataset["id"]
     checksum = dataset["checksum"]

eotdl/datasets/ingest.py

@@ -1,19 +1,10 @@
 from ..src.repos import APIRepo
-from ..src.usecases.datasets.IngestDataset import IngestDataset
-from ..src.usecases.datasets.IngestLargeDataset import IngestLargeDataset
+from ..src.usecases.datasets import IngestDataset, IngestLargeDataset
+from ..auth import with_auth
 
 
-def ingest_q0(dataset, file):
-    print("hola")
-    return
-
-
-def ingest_q1(dataset, stac_catalog):
-    print("hola")
-    return
-
-
-def ingest_dataset(name, description, path, user, logger):
+@with_auth
+def ingest_dataset(name, description, path, logger=None, user=None):
     api_repo = APIRepo()
     ingest = IngestDataset(
         api_repo,
@@ -23,9 +14,19 @@ def ingest_dataset(name, description, path, user, logger):
     return outputs.dataset
 
 
-def ingest_large_dataset(name, path, user, logger):
+@with_auth
+def ingest_large_dataset(name, path, logger=None, user=None):
     api_repo = APIRepo()
     ingest = IngestLargeDataset(api_repo, logger)
     inputs = ingest.Inputs(name=name, path=path, user=user)
     outputs = ingest(inputs)
     return outputs.dataset
+
+
+def ingest_q0(dataset, path):
+    return ingest_large_dataset(dataset, path)
+
+
+def ingest_q1(dataset, stac_catalog):
+    print("holas")
+    return

eotdl/datasets/retrieve.py

@@ -1,6 +1,9 @@
 from ..src.repos import APIRepo
-from ..src.usecases.datasets.RetrieveDatasets import RetrieveDatasets
-from ..src.usecases.datasets.RetrieveDataset import RetrieveDataset
+from ..src.usecases.datasets import RetrieveDatasets, RetrieveDataset
+
+
+def list_datasets():
+    return retrieve_datasets()
 
 
 def retrieve_datasets():

eotdl/datasets/update.py

@@ -1,8 +1,10 @@
 from ..src.repos import APIRepo
-from ..src.usecases.datasets.UpdateDataset import UpdateDataset
+from ..src.usecases.datasets import UpdateDataset
+from ..auth import with_auth
 
 
-def update_dataset(name, path, user, logger):
+@with_auth
+def update_dataset(name, path, logger=None, user=None):
     api_repo = APIRepo()
     ingest = UpdateDataset(api_repo, logger)
     inputs = ingest.Inputs(name=name, path=path, user=user)

eotdl/src/repos/APIRepo.py

@@ -35,7 +35,7 @@ class APIRepo:
         url = self.url + "datasets/" + dataset_id + "/download"
         headers = {"Authorization": "Bearer " + id_token}
         if path is None:
-            path = str(Path.home()) + "/.etodl/datasets"
+            path = str(Path.home()) + "/.eotdl/datasets"
             os.makedirs(path, exist_ok=True)
         with requests.get(url, headers=headers, stream=True) as r:
             r.raise_for_status()
@@ -46,6 +46,8 @@ class APIRepo:
             )
             filename = r.headers.get("content-disposition").split("filename=")[1][1:-1]
             path = f"{path}/{filename}"
+            if os.path.exists(path):
+                raise Exception("File already exists")
             with open(path, "wb") as f:
                 for chunk in r.iter_content(block_size):
                     progress_bar.update(len(chunk))

eotdl/src/repos/AuthRepo.py

@@ -1,31 +1,36 @@
 from pathlib import Path
-import os 
-import json 
+import os
+import json
 import jwt
 
-class AuthRepo():
+
+class AuthRepo:
     def __init__(self):
-        self.algorithms = ['RS256']
+        self.algorithms = ["RS256"]
         self.home = str(Path.home())
-        self.creds_path = self.home + '/.etodl/creds.json'
+        self.creds_path = self.home + "/.eotdl/creds.json"
 
     def save_creds(self, data):
-        os.makedirs(self.home + '/.etodl', exist_ok=True)
-        with open(self.creds_path, 'w') as f:
+        os.makedirs(self.home + "/.eotdl", exist_ok=True)
+        with open(self.creds_path, "w") as f:
             json.dump(data, f)
         return self.creds_path
-    
+
     def load_creds(self):
         if os.path.exists(self.creds_path):
-            with open(self.creds_path, 'r') as f:
+            with open(self.creds_path, "r") as f:
                 creds = json.load(f)
             user = self.decode_token(creds)
-            user['id_token'] = creds['id_token']
+            user["id_token"] = creds["id_token"]
             return user
         return None
-    
+
     def decode_token(self, token_data):
-        return jwt.decode(token_data['id_token'], algorithms=self.algorithms, options={"verify_signature": False})
-    
+        return jwt.decode(
+            token_data["id_token"],
+            algorithms=self.algorithms,
+            options={"verify_signature": False},
+        )
+
     def logout(self):
         os.remove(self.creds_path)

eotdl/src/usecases/auth/__init__.py

@@ -0,0 +1,3 @@
+from .Auth import Auth
+from .IsLogged import IsLogged
+from .Logout import Logout

eotdl/src/usecases/datasets/DownloadDataset.py

@@ -5,7 +5,7 @@ from ....src.utils import calculate_checksum
 class DownloadDataset:
     def __init__(self, repo, logger):
         self.repo = repo
-        self.logger = logger
+        self.logger = logger if logger else print
 
     class Inputs(BaseModel):
         dataset: str

eotdl/src/usecases/datasets/IngestDataset.py

@@ -4,7 +4,7 @@ from pydantic import BaseModel
 class IngestDataset:
     def __init__(self, repo, logger):
         self.repo = repo
-        self.logger = logger
+        self.logger = logger if logger else print
 
     class Inputs(BaseModel):
         name: str

eotdl/src/usecases/datasets/IngestLargeDataset.py

@@ -5,7 +5,7 @@ from ....src.utils import calculate_checksum
 class IngestLargeDataset:
     def __init__(self, repo, logger):
         self.repo = repo
-        self.logger = logger
+        self.logger = logger if logger else print
 
     class Inputs(BaseModel):
         name: str

eotdl/src/usecases/datasets/UpdateDataset.py

@@ -5,7 +5,7 @@ from ....src.utils import calculate_checksum
 class UpdateDataset:
     def __init__(self, repo, logger):
         self.repo = repo
-        self.logger = logger
+        self.logger = logger if logger else print
 
     class Inputs(BaseModel):
         name: str

eotdl/src/usecases/datasets/__init__.py

@@ -0,0 +1,6 @@
+from .DownloadDataset import DownloadDataset
+from .IngestDataset import IngestDataset
+from .IngestLargeDataset import IngestLargeDataset
+from .RetrieveDataset import RetrieveDataset
+from .RetrieveDatasets import RetrieveDatasets
+from .UpdateDataset import UpdateDataset

{eotdl-2023.6.14.post8.dist-info → eotdl-2023.6.14.post10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eotdl
-Version: 2023.6.14.post8
+Version: 2023.6.14.post10
 Summary: Earth Observation Training Data Lab
 License: MIT
 Author: EarthPulse

{eotdl-2023.6.14.post8.dist-info → eotdl-2023.6.14.post10.dist-info}/RECORD

@@ -4,12 +4,12 @@ eotdl/access/parameters.py,sha256=g24CVwJR-KuHBgNyXj_Y6W2OoGSkKFN7IkidYDvPLws,36
 eotdl/access/sentinelhub/__init__.py,sha256=v3P2WjEQuA9bmh8RHE3zuADSL_CEukTRyzR66J3kQVg,252
 eotdl/access/sentinelhub/client.py,sha256=skL3EfVuBLSoOc8gbbsWuAe9UTDYSI1IdpqU8HsdNW4,7605
 eotdl/access/sentinelhub/utils.py,sha256=4xzAOoxA4A3EmBD1HX7IAbiXl9cMTfYabq0wGkFrx8A,6595
-eotdl/auth/__init__.py,sha256=PjlHb69cgXcrlyCkvNeEZEegj-DZsVXzuYb1N8MwVWY,55
-eotdl/auth/main.py,sha256=_6UUGhfJjwDetROT4bBSapuv4zmKlaawuSDNXHJgaW0,776
+eotdl/auth/__init__.py,sha256=gN4x9suYveP1eZr5_7IisdTVy13B-Xnm_t6N_nwoI1o,66
+eotdl/auth/main.py,sha256=q3-JcDbLJMEBSXa4Y7fofso4iK-b4QjL8QV0Ok7eqG8,857
 eotdl/cli.py,sha256=MQt1XWTrqPC-onQcAeo5Oq_pIgBQh7KdYkFPoZiJQi0,193
 eotdl/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eotdl/commands/auth.py,sha256=_Kgud59Wp8Jc1Y-o8XZRXrtd_3QfRJ4d7H8HsCg0smg,937
-eotdl/commands/datasets.py,sha256=a5CLOqvMCygOaToy_GGnorn3ZhByp5d7x6Tk1usRA7U,1569
+eotdl/commands/datasets.py,sha256=EVHJUJ0j3P4H6tF7sngNFgLwcG47upVHtunakrPkhbE,1485
 eotdl/curation/__init__.py,sha256=wdcnj-u8fwObyjF8LNebwYyUULEfp3m41X1TSjURO6w,270
 eotdl/curation/formatters.py,sha256=UllCEsWspqzoBOBy4iAz5oSh4AAMva88orFFmE5binA,2929
 eotdl/curation/metadata.py,sha256=m6mcCr7UI3Mgij3FbhQAHWetXyADJIQoL2JTUas8GoU,1552
@@ -19,37 +19,37 @@ eotdl/curation/stac/extensions.py,sha256=I8SRMn9lyw_0sNZ-FiJ7HYPEGozylgf58gVWBSA
 eotdl/curation/stac/parsers.py,sha256=KumL2ieBt0ATGgKoGyc-AJ99zSMeLD4-tI5MF9ruYPw,1380
 eotdl/curation/stac/stac.py,sha256=COFpXQAvVBpgNf7qVv3DfIalBzdnvyVuDiEDEGgnYsA,17796
 eotdl/curation/stac/utils.py,sha256=WxC1uRY3BJJh0GFgrU3IAV4-_vwMaUyeRYwUcySfj9k,1855
-eotdl/datasets/__init__.py,sha256=wdRufZVaMuL4ARUs9-YgExEDEtv-1jGXm-BRV53pQt8,211
-eotdl/datasets/download.py,sha256=KGJprSE2nZh79-EKwe9RjuFWLgKQdCIR9zdmGBxuYRY,529
-eotdl/datasets/ingest.py,sha256=eMfjQKf12-_uaXg6NyoQgdOr962Pusm5YF78e42ezSA,824
-eotdl/datasets/retrieve.py,sha256=VGUmCV5hPpTkGKovrALVFsA7hIghBkILFCiUEY3_Rn8,548
-eotdl/datasets/update.py,sha256=kVPBtcfNBx6BsBuO64IPFE-f4Tw3_uixOL7jrYNnKR0,330
+eotdl/datasets/__init__.py,sha256=e_FZ1j6Qly-hLlCN4UrSdSfHjEID6YVHsDn20BUPps4,226
+eotdl/datasets/download.py,sha256=b0vbA517fI95h1jA1pFGe-lBvesbpRRPHXhR6wQrPiI,568
+eotdl/datasets/ingest.py,sha256=8656jxl-lMWYsEaI584iUAD451l-Jg8okN3X_7NU_Iw,846
+eotdl/datasets/retrieve.py,sha256=sXQq5FEAAx48lf6GkaGg8zyMl4KnTRp8dU6JTUjF_RQ,534
+eotdl/datasets/update.py,sha256=oePVcFnlVLEjMKy9Yls1so1lkRCbQBEmoIE6JRJ2gAA,366
 eotdl/hello.py,sha256=bkYLbDXy00l9-wcHDRZT9GUhsgJOHLp3N8yfYaGg6mY,74
 eotdl/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eotdl/src/errors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eotdl/src/errors/auth.py,sha256=PpnFU2DvnRo8xrM77wgskKi0tfEJ1Rhle4xv2RD1qpk,306
-eotdl/src/repos/APIRepo.py,sha256=jpSvDk0nXHpXWP2D-W9m0uJtgS26g3HwblJN_bvNkVE,9843
-eotdl/src/repos/AuthRepo.py,sha256=fUerbkPU709hQ3g3z-qJsg6AYJWksbiHiEP4PtNpioQ,955
+eotdl/src/repos/APIRepo.py,sha256=1cDUf-_4g87OXNksYtABWLhbuUrRSiU75m-eBjuRSgM,9935
+eotdl/src/repos/AuthRepo.py,sha256=5Gwj7D4MgZWdvGFgoWPQeI_OM7Gv4XWc9lkD2wMy1k4,987
 eotdl/src/repos/__init__.py,sha256=kJTtURg8RZ4GSwhFFyul-SX240r25wvLuwxIhyz9kmI,59
 eotdl/src/usecases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eotdl/src/usecases/auth/Auth.py,sha256=e36UNqjXSxrkM30lBmEtPd8FZr49Xt_uyTj9yieX7es,1587
 eotdl/src/usecases/auth/IsLogged.py,sha256=CTHKct0V1kCx54eQGElkzeDZoWN6CIppfDEFas6ToNI,332
 eotdl/src/usecases/auth/Logout.py,sha256=ZlCMnaSerqBr6XOCcV858qq8IMTAizx6dta-UB5qoVE,420
-eotdl/src/usecases/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eotdl/src/usecases/datasets/DownloadDataset.py,sha256=c_tXZwmLRQN8qXX5le7Pnbe6oYafSSn1jasPkVt4HWc,767
-eotdl/src/usecases/datasets/IngestDataset.py,sha256=iXOwHj_Ng6Dmf9Py5KXonc5Z5mphsefAiN5r-dcB6g4,932
-eotdl/src/usecases/datasets/IngestLargeDataset.py,sha256=5_rOK3fh8gE8kybV02cM9VAG1xI-mCTWgykZ_HZqu8I,1407
+eotdl/src/usecases/auth/__init__.py,sha256=w9zv66rZDKgwuzETCkvYefs2gcA1VEzvtQXfBt-KOSk,81
+eotdl/src/usecases/datasets/DownloadDataset.py,sha256=tZ0jamae0HBU3T9jnum3Qh9jruvfRBSToW07-GjNj2A,788
+eotdl/src/usecases/datasets/IngestDataset.py,sha256=d2H5nPXsEj-LhZpWGwNDSPs9uYNXRO2V07xsTFygQDc,953
+eotdl/src/usecases/datasets/IngestLargeDataset.py,sha256=Q4sR2wyRyUsCwgFucKoNPc2SpbmX74IDXROmSwwyT4Q,1428
 eotdl/src/usecases/datasets/IngestLargeDatasetParallel.py,sha256=egcl54K_Oi0BUSJeIdoQSl8BczBQXY1kCf3SWiLuc6s,1595
 eotdl/src/usecases/datasets/RetrieveDataset.py,sha256=rmoSLllsPx3PCnIxLhR8yiibbk6xS1Pz9yvZ0RxhsHg,421
 eotdl/src/usecases/datasets/RetrieveDatasets.py,sha256=NMtmVA4Ma6TxJwGbyW2KPgAEN4RV8SWRzKVivqbt0Lo,427
-eotdl/src/usecases/datasets/UpdateDataset.py,sha256=E_YQuVMsbsfjEY7DkyfdUbbKdgzTMa70GB4Mui38CYM,944
-eotdl/src/usecases/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+eotdl/src/usecases/datasets/UpdateDataset.py,sha256=BD3qMOzh_bk5QAh_JB_cEA92bTilm5EN6f2sWf0QXx0,965
+eotdl/src/usecases/datasets/__init__.py,sha256=bcUQ867J4YeQcT6nMod7yqyZ6fTYHcUBioXmMcspE80,270
 eotdl/src/utils.py,sha256=I_s5wKnyDmjzsKWlDSsnFVYnJn6YyJwlqf0rxHKe-Ac,479
 eotdl/tools/__init__.py,sha256=pyWj9kl-0p-KSUSZ7BV8BoSYxj7j-OfGKt9NE3qw_3Q,277
 eotdl/tools/sen12floods/__init__.py,sha256=J3McIaLi_Bp5-EIVfFWHwm0qYx7PtWydCrWwju8xFW0,215
 eotdl/tools/sen12floods/tools.py,sha256=rPOkwZw_CdecfREUPMrjYCu1jI2OBhk_8PHL2MNTdV8,8124
 eotdl/tools/stac.py,sha256=s-Js3wkqFIQwbWlr4hNTtkUgX_3Suf4A2eUUQEaE-30,636
-eotdl-2023.6.14.post8.dist-info/entry_points.txt,sha256=s6sfxUfRrSX2IP2UbrzTFTvRCtLgw3_OKcHlOKf_5F8,39
-eotdl-2023.6.14.post8.dist-info/WHEEL,sha256=gSF7fibx4crkLz_A-IKR6kcuq0jJ64KNCkG8_bcaEao,88
-eotdl-2023.6.14.post8.dist-info/METADATA,sha256=XKHxKGs13mak7qyzsBXXAXpMRwFJapkmfzVHP86YxLE,745
-eotdl-2023.6.14.post8.dist-info/RECORD,,
+eotdl-2023.6.14.post10.dist-info/entry_points.txt,sha256=s6sfxUfRrSX2IP2UbrzTFTvRCtLgw3_OKcHlOKf_5F8,39
+eotdl-2023.6.14.post10.dist-info/WHEEL,sha256=gSF7fibx4crkLz_A-IKR6kcuq0jJ64KNCkG8_bcaEao,88
+eotdl-2023.6.14.post10.dist-info/METADATA,sha256=UJKGSc9SppEVrHJaEQEhDjlHVG2R2Lkin8nHgknkHrI,746
+eotdl-2023.6.14.post10.dist-info/RECORD,,