eotdl 2023.11.2__py3-none-any.whl → 2023.11.2.post2__py3-none-any.whl

eotdl/__init__.py

@@ -1 +1 @@
-__version__ = "2023.11.02"
+__version__ = "2023.11.02-2"

eotdl/datasets/retrieve.py

@@ -20,7 +20,7 @@ def retrieve_dataset(name):
 
 def retrieve_dataset_files(dataset_id, version):
     repo = FilesAPIRepo()
-    data, error = repo.retrieve_dataset_files(dataset_id, version)
+    data, error = repo.retrieve_files(dataset_id, "datasets", version)
     if error:
         raise Exception(error)
     return data

eotdl/files/ingest.py

@@ -63,7 +63,9 @@ def generate_files_lists(
     items, folder, dataset_or_model_id, endpoint, logger, max_size=1024 * 1024 * 16
 ):
     files_repo = FilesAPIRepo()
-    current_files, error = files_repo.retrieve_files(dataset_or_model_id, endpoint)
+    current_files, error = files_repo.retrieve_files(
+        dataset_or_model_id, "models", endpoint
+    )
     # print(len(current_files), len(items) - len(current_files))
     # print(current_files, error)
     if error:
@@ -129,7 +131,7 @@ def ingest_files(repo, dataset_or_model_id, folder, verbose, logger, user, endpo
                 parts,
                 endpoint,
             )
-            files_repo.complete_upload(user["id_token"], upload_id, version)
+            files_repo.complete_upload(user["id_token"], upload_id, version, endpoint)
     # ingest new small files in batches
     if len(upload_files) > 0:
         logger("generating batches...")
@@ -149,7 +151,7 @@ def ingest_files(repo, dataset_or_model_id, folder, verbose, logger, user, endpo
                 [f["checksum"] for f in batch],
                 dataset_or_model_id,
                 user["id_token"],
-                "datasets",
+                endpoint,
                 version,
             )
     # ingest existing files
@@ -166,7 +168,7 @@ def ingest_files(repo, dataset_or_model_id, folder, verbose, logger, user, endpo
                 dataset_or_model_id,
                 version,
                 user["id_token"],
-                "datasets",
+                endpoint,
             )
             if error:
                 raise Exception(error)

eotdl/models/retrieve.py

@@ -20,7 +20,7 @@ def retrieve_model(name):
 
 def retrieve_model_files(model_id, version):
     repo = FilesAPIRepo()
-    data, error = repo.retrieve_model_files(model_id, version)
+    data, error = repo.retrieve_files(model_id, "models", version)
     if error:
         raise Exception(error)
     return data

eotdl/repos/FilesAPIRepo.py

@@ -198,9 +198,9 @@ class FilesAPIRepo(APIRepo):
         pbar.close()
         return
 
-    def complete_upload(self, id_token, upload_id, version):
+    def complete_upload(self, id_token, upload_id, version, endpoint):
         r = requests.post(
-            self.url + "datasets/complete/" + upload_id + "?version=" + str(version),
+            f"{self.url}{endpoint}/complete/{upload_id}?version={version}",
             headers={"Authorization": "Bearer " + id_token},
         )
         return self.format_response(r)

{eotdl-2023.11.2.dist-info → eotdl-2023.11.2.post2.dist-info}/METADATA

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

{eotdl-2023.11.2.dist-info → eotdl-2023.11.2.post2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-eotdl/__init__.py,sha256=qPacbDrZCgcwiNooGBVBEZK-2Tq78pISjE2QexaF8so,27
+eotdl/__init__.py,sha256=vq3__ImOs-riW0l9qLaTFxxobD0xu7idyuL5K_MsdVA,29
 eotdl/access/__init__.py,sha256=OFdCDemao6Ez1w18-ydQ8G_CqeQ8h43hFcdsJcq2UKI,208
 eotdl/access/airbus/__init__.py,sha256=KdVilLghjjs_EEMGlbZntveRR7yA6pg_CdV04ulZWiQ,75
 eotdl/access/airbus/client.py,sha256=thVIfCscsrOp6l2uizY6Fai4Jk4e_r-2luyr15YAxn0,11017
@@ -46,7 +46,7 @@ eotdl/datasets/__init__.py,sha256=GIfgqrFq1LblG8qT1zNthm28drw1faLAenGbKjX0rdw,17
 eotdl/datasets/download.py,sha256=SBUsYqnKahw4MMOSzT2pxX5bDD1f1wAu31ovtuQu4Fo,4381
 eotdl/datasets/ingest.py,sha256=oQ3KycGXRC8qBiV4VFfdyDfQn2HP86RAx78ZiM2MKf8,1792
 eotdl/datasets/metadata.py,sha256=L23_EziGVSDJ-WZbYUYNN22GrgbCdMGxwJhgK9uzW0U,390
-eotdl/datasets/retrieve.py,sha256=pL7SEbW_6yfr-s3MIT43zyhbw4SPyAwpHSQ8kYG5eac,1037
+eotdl/datasets/retrieve.py,sha256=DJz5K1bCLizg9YNwBnhHMFzcxMXar2socYkFONdSL4c,1041
 eotdl/datasets/usecases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eotdl/datasets/usecases/datasets/DownloadFile.py,sha256=PoP0Dl2LBshKzbgArgxwxIVs-KT2IsfZKi0qSyiBsoI,936
 eotdl/datasets/usecases/datasets/DownloadFileURL.py,sha256=6OcNuCys45MXu9-7GtES0zg2QmY02EAkj_P3cVKVUvo,603
@@ -56,17 +56,17 @@ eotdl/datasets/usecases/datasets/IngestLargeDatasetParallel.py,sha256=G6uVmpZLkn
 eotdl/datasets/usecases/datasets/IngestSTAC.py,sha256=QAMLSkMFlc-ic0JWaIdAf0SXPkYcawy-RJqfvDqTD7A,3075
 eotdl/datasets/usecases/datasets/__init__.py,sha256=Tx4ISHtcjbu4KUVgjTac_pjpT0vsN-QpkIwtyx8xUYg,383
 eotdl/files/__init__.py,sha256=71KfzCidZzFV82Zmc2GRxXzpB9sZKGI95lBxySRxbPY,33
-eotdl/files/ingest.py,sha256=DlCqCEBbadJQcUK1yShJZ-SpmGcq5wXETT_FUc6W9Uk,5990
+eotdl/files/ingest.py,sha256=mnjqellKIf-jVVAjharV5rehU4mmv7GxGhRwJ2BtCcw,6020
 eotdl/models/__init__.py,sha256=fe1VfnlOxlfviphkkzaY4q8mkm0QxcdJxB3peScBZYk,108
 eotdl/models/download.py,sha256=hWFEuJUZsjYnSDixMkHgmYDwxNMJEQ13-AJQPnyZOiY,4340
 eotdl/models/ingest.py,sha256=Zxv9oL5VOqPXgJgaOROt7v2twRPqzajllpP5ZgyNf3Q,1519
 eotdl/models/metadata.py,sha256=L23_EziGVSDJ-WZbYUYNN22GrgbCdMGxwJhgK9uzW0U,390
-eotdl/models/retrieve.py,sha256=Z3c6qnZTFGtVjvg22sjkZssnRFJCHKeHshz6ueQxiz8,660
+eotdl/models/retrieve.py,sha256=-Ij7dT4J1p7MW4n13OlPB9OW4tBaBXPwk9dW8IuCZPc,664
 eotdl/repos/APIRepo.py,sha256=tjvtr96d1fhnKEdGDmc90NrwBW7YVCtdsKLLtV82SBE,402
 eotdl/repos/AuthAPIRepo.py,sha256=T-TPDjZa1u-JnUsKoKp-T9x__L0aUfLUUdP7xZFV_hI,770
 eotdl/repos/AuthRepo.py,sha256=6AWOdWgXKAVYJ2pB3Fj6X2KABoH2u-tpUyhEkNMWxX0,1001
 eotdl/repos/DatasetsAPIRepo.py,sha256=HQh4PCS9zP6zPK86lsfUX08jhKIlOKUOswZaROVMkYY,9979
-eotdl/repos/FilesAPIRepo.py,sha256=nFDaU55bHzfBgQDKXp-1VKjpCMwyoMQljM3TmO4v8Do,10924
+eotdl/repos/FilesAPIRepo.py,sha256=WgGTyYljlSFxD8-0BePEwdks6voVy5rPjqdTruc31MQ,10924
 eotdl/repos/ModelsAPIRepo.py,sha256=6PDn1eHb0g3dVyQyB5aEGnIlWi9Ez8Vlnj4A_QL3Ea8,1211
 eotdl/repos/__init__.py,sha256=WvX5TP49k7yYb5dWWNjv5kzbdluO3dJ4LqjQxRIOUVc,222
 eotdl/shared/__init__.py,sha256=mF7doJC8Z5eTPmB01UQvPivThZac32DRY33T6qshXfg,41
@@ -78,7 +78,7 @@ eotdl/tools/paths.py,sha256=IEzfpjadd3KnwOQ6F_1vBRyxnm12QcD1TboPRd-I15w,1166
 eotdl/tools/stac.py,sha256=cqv9Dc2uUnonMKF6MP9C5h9fHs-oENjgmcnRJNRWNgA,5937
 eotdl/tools/time_utils.py,sha256=pb8h4bCQTTarNHq38UfjNotefm5l4qGjpYBENzzcqHY,4212
 eotdl/tools/tools.py,sha256=x2UFa5wHunX4qn3lqZYP0BtPHZB-w3dMwK1fac8LUhI,6100
-eotdl-2023.11.2.dist-info/METADATA,sha256=AogDMx9vC7nMub7AH9pohHDhjalHidaxhkmtcw8zxsU,3923
-eotdl-2023.11.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-eotdl-2023.11.2.dist-info/entry_points.txt,sha256=s6sfxUfRrSX2IP2UbrzTFTvRCtLgw3_OKcHlOKf_5F8,39
-eotdl-2023.11.2.dist-info/RECORD,,
+eotdl-2023.11.2.post2.dist-info/METADATA,sha256=SZCcWR1nXbqijiUCFCeSOThICABwsDLvQ0K_iQ8zzWc,3929
+eotdl-2023.11.2.post2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+eotdl-2023.11.2.post2.dist-info/entry_points.txt,sha256=s6sfxUfRrSX2IP2UbrzTFTvRCtLgw3_OKcHlOKf_5F8,39
+eotdl-2023.11.2.post2.dist-info/RECORD,,