eotdl 2024.8.5__py3-none-any.whl → 2024.10.1__py3-none-any.whl

eotdl/__init__.py

@@ -1 +1 @@
-__version__ = "2024.08.05"
+__version__ = "2024.10.01"

eotdl/datasets/ingest.py

@@ -3,7 +3,6 @@ import yaml
 from tqdm import tqdm
 import json
 import frontmatter
-import markdown
 
 from ..auth import with_auth
 from .metadata import Metadata
@@ -60,20 +59,19 @@ def ingest_folder(
         readme = frontmatter.load(folder.joinpath("README.md"))
         metadata, content = readme.metadata, readme.content
         metadata = Metadata(**metadata)
-    except FileNotFoundError:
-        # load metadata (legacy)
-        metadata = (
-            yaml.safe_load(open(folder.joinpath("metadata.yml"), "r").read()) or {}
-        )
-        metadata = Metadata(**metadata)
-        content = None
+    # except FileNotFoundError:
+    #     # load metadata (legacy)
+    #     metadata = (
+    #         yaml.safe_load(open(folder.joinpath("metadata.yml"), "r").read()) or {}
+    #     )
+    #     metadata = Metadata(**metadata)
+    #     content = None
     except Exception as e:
-        # print(str(e))
+        print(str(e))
         raise Exception("Error loading metadata")
     # retrieve dataset (create if doesn't exist)
     dataset = retrieve_dataset(metadata, user)
-    if content:
-        content = markdown.markdown(content)
+
     update_metadata = True
     if "description" in dataset:
         # do not do this if the dataset is new, only if it already exists

eotdl/datasets/metadata.py

@@ -1,6 +1,5 @@
 from pydantic import BaseModel, validator
 from typing import List, Optional
-import markdownify
 from pathlib import Path
 
 
@@ -21,6 +20,8 @@ class Metadata(BaseModel):
     # validate thumbnail is a url
     @validator("thumbnail")
     def thumbnail_is_url(cls, v):
+        if not v:
+            return ""
         if not v.startswith("http") and not v.startswith("https"):
             raise ValueError("thumbnail must be a URL")
         return v
@@ -37,7 +38,7 @@ def generate_metadata(download_path, dataset):
         for author in dataset["authors"]:
             f.write(f"  - {author}\n")
         f.write("---\n")
-        f.write(markdownify.markdownify(dataset["description"], heading_style="ATX"))
+        f.write(dataset["description"])
     # remove metadata.yml if exists
     if Path(download_path + "/metadata.yml").exists():
         Path(download_path + "/metadata.yml").unlink()

eotdl/models/download.py

@@ -74,9 +74,12 @@ def download_model(
         )
         if error:
             raise Exception(error)
+        print(gdf)
         df = STACDataFrame(gdf)
         # df.geometry = df.geometry.apply(lambda x: Polygon() if x is None else x)
         df.to_stac(download_path)
+        print("----")
+        print(df)
         # download assets
         if assets:
             if verbose:

eotdl/models/ingest.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 import yaml
 import frontmatter
-import markdown
 from tqdm import tqdm
 import json
 
@@ -67,8 +66,7 @@ def ingest_folder(
         raise Exception(f"Error loading metadata: {e}")
     # retrieve model (create if doesn't exist)
     model = retrieve_model(metadata, user)
-    if content:
-        content = markdown.markdown(content)
+
     update_metadata = True
     if "description" in model:
         # do not do this if the model is new, only if it already exists

eotdl/models/metadata.py

@@ -1,6 +1,5 @@
 from pydantic import BaseModel, validator
 from typing import List, Optional
-import markdownify
 from pathlib import Path
 
 
@@ -37,7 +36,7 @@ def generate_metadata(download_path, model):
         for author in model["authors"]:
             f.write(f"  - {author}\n")
         f.write("---\n")
-        f.write(markdownify.markdownify(model["description"], heading_style="ATX"))
+        f.write(model["description"])
     # remove metadata.yml if exists
     if Path(download_path + "/metadata.yml").exists():
         Path(download_path + "/metadata.yml").unlink()

{eotdl-2024.8.5.dist-info → eotdl-2024.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eotdl
-Version: 2024.8.5
+Version: 2024.10.1
 Summary: Earth Observation Training Data Lab
 License: MIT
 Author: EarthPulse
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: black (>=23.10.1,<24.0.0)
 Requires-Dist: geomet (>=1.0.0,<2.0.0)
 Requires-Dist: geopandas (>=0.13.2,<0.14.0)

{eotdl-2024.8.5.dist-info → eotdl-2024.10.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-eotdl/__init__.py,sha256=yMIfrgqlwcSNDdevn3fCc-QH3WedzzXeo4PbrrP_CuE,27
+eotdl/__init__.py,sha256=GYhbp_qDI4r7Y9hYO76t0DwK_JCtUw2UK-DbHzV4XKk,27
 eotdl/access/__init__.py,sha256=jbyjD7BRGJURlTNmtcbBBhw3Xk4EiZvkqmEykM-bJ1k,231
 eotdl/access/airbus/__init__.py,sha256=G_kkRS9eFjXbQ-aehmTLXeAxh7zpAxz_rgB7J_w0NRg,107
 eotdl/access/airbus/client.py,sha256=zjfgB_NTsCCIszoQesYkyLJgheKg-eTh28vbleXYxfw,12018
@@ -44,17 +44,17 @@ eotdl/curation/stac/parsers.py,sha256=H5IukLA61mpLojeuhWNQdiZk2eiYHAfpJBFxmjdGDs
 eotdl/curation/stac/stac.py,sha256=9GdiB1mV8iyREvXZoJmNJKQGawWyK3h9Eu0hJX5u6O4,13180
 eotdl/datasets/__init__.py,sha256=xNbkUjqI1mf0TGjy52tpZtr5DnWNX5EVgyM04P4sU3Y,175
 eotdl/datasets/download.py,sha256=JSOi7OKiENYQ3TRVj2WsC1CPYD22VlC9W5kYHPfx8Vs,3667
-eotdl/datasets/ingest.py,sha256=Ukiah6TapD1oBE0AxUTaEFf-k3hAMRrKr4cXVlVW-_Y,5806
-eotdl/datasets/metadata.py,sha256=qonblTDGr4IZvJaiIc2rh7qwP76whEA72DorSVqZxd4,1457
+eotdl/datasets/ingest.py,sha256=F7mwQQok3rqZkGiQC-71Jc4dYDN5OSB_SXEACdCZKkk,5742
+eotdl/datasets/metadata.py,sha256=jRoW9n32sUQgX3439WUCL8BJZojXKKXpmCM344XMDMc,1432
 eotdl/datasets/retrieve.py,sha256=DJz5K1bCLizg9YNwBnhHMFzcxMXar2socYkFONdSL4c,1041
 eotdl/datasets/update.py,sha256=x-rpfxnavn9X-7QYkFMGtbn1b3bKmAZydOeS7Tjr5AQ,386
 eotdl/files/__init__.py,sha256=2zfAxgLHmU_jWq_3emnfPXsX-R20gSt-yZX0bPa9h0g,87
 eotdl/files/ingest.py,sha256=dgjZfd-ACCKradDo2B02CPahwEhFtWvnKvTm372K5eo,6185
 eotdl/files/list_files.py,sha256=k4OgdbQ7u6tUEE9nJZGXw5s5HtvG0ZApOVTy0KbfTqs,519
 eotdl/models/__init__.py,sha256=-PvGWG0iSRNBqeFWpxol12dYw-QodXjR81n-JX3x6zI,146
-eotdl/models/download.py,sha256=4dgxE9ytT8QqiCyx1r19vL5UASfttUN_mCPKhFwMTfs,3410
-eotdl/models/ingest.py,sha256=8xhGlsADi5dZSNbph4WWMk0cs2J_StxNCYRkSjMhUtg,5747
-eotdl/models/metadata.py,sha256=S5bpIB4e2pivDnReszJKC3bYBZcaHu-KMYOc3AwHbQ4,1443
+eotdl/models/download.py,sha256=ppCeKsK2YzdimYRKXiF5dfGI6VyXw_T9lOnKO54Ojjg,3469
+eotdl/models/ingest.py,sha256=ipWNSyL8WwW9PPUAFcS9mLYow_1PTCpNQ_DsXKQ3Hvw,5671
+eotdl/models/metadata.py,sha256=Lu_Vv6YJJ9aLPvJa44tFfbBZiyxweOI2BHfq00aNRjY,1378
 eotdl/models/retrieve.py,sha256=-Ij7dT4J1p7MW4n13OlPB9OW4tBaBXPwk9dW8IuCZPc,664
 eotdl/models/update.py,sha256=4FWeD95cXvRpefRjw3Foqb30e30otxqWUZ6nQM9cbmM,374
 eotdl/repos/APIRepo.py,sha256=dJNdX3atBpug0FZNako7uyom25iccNPQrnoIRTIZEXE,791
@@ -73,7 +73,7 @@ eotdl/tools/paths.py,sha256=yWhOtVxX4NxrDrrBX2fuye5N1mAqrxXFy_eA7dffd84,1152
 eotdl/tools/stac.py,sha256=ovXdrPm4Sn9AAJmrP88WnxDmq2Ut-xPoscjphxz3Iyo,5763
 eotdl/tools/time_utils.py,sha256=qJ3-rk1I7ne722SLfAP6-59kahQ0vLQqIf9VpOi0Kpg,4691
 eotdl/tools/tools.py,sha256=Tl4_v2ejkQo_zyZek8oofJwoYcdVosdOwW1C0lvWaNM,6354
-eotdl-2024.8.5.dist-info/METADATA,sha256=Y_87iidU9smaRT0WfT8NoiQCj1xR0mapLP5XwSygAmg,4092
-eotdl-2024.8.5.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-eotdl-2024.8.5.dist-info/entry_points.txt,sha256=s6sfxUfRrSX2IP2UbrzTFTvRCtLgw3_OKcHlOKf_5F8,39
-eotdl-2024.8.5.dist-info/RECORD,,
+eotdl-2024.10.1.dist-info/METADATA,sha256=FSAul-2xBkcUyN-T0tk8YX0Kp_ZzlQ4AAk0e9IxYmKk,4144
+eotdl-2024.10.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+eotdl-2024.10.1.dist-info/entry_points.txt,sha256=s6sfxUfRrSX2IP2UbrzTFTvRCtLgw3_OKcHlOKf_5F8,39
+eotdl-2024.10.1.dist-info/RECORD,,

{eotdl-2024.8.5.dist-info → eotdl-2024.10.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any