eotdl 2023.11.2__tar.gz → 2023.11.2.post2__tar.gz

{eotdl-2023.11.2 → eotdl-2023.11.2.post2}/PKG-INFO

@@ -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.post2/eotdl/__init__.py

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

{eotdl-2023.11.2 → eotdl-2023.11.2.post2}/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-2023.11.2 → eotdl-2023.11.2.post2}/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-2023.11.2 → eotdl-2023.11.2.post2}/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-2023.11.2 → eotdl-2023.11.2.post2}/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 → eotdl-2023.11.2.post2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "eotdl"
-version = "2023.11.02"
+version = "2023.11.02-2"
 description = "Earth Observation Training Data Lab"
 authors = ["EarthPulse <it@earthpulse.es>"]
 license = "MIT"

eotdl-2023.11.2/eotdl/__init__.py

@@ -1 +0,0 @@
-__version__ = "2023.11.02"