eotdl 2024.8.5__tar.gz → 2024.10.1__tar.gz

{eotdl-2024.8.5 → eotdl-2024.10.1}/PKG-INFO

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

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

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

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

eotdl-2024.8.5/eotdl/__init__.py

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