add download url to form, only show license when it exists

Author: robkooper

app.py

@@ -86,6 +86,12 @@ def render_template(template, dataset):
     else:
         kwargs["filesize"] = "N/A"
 
+    # Compute download_url based on presence of url in the dataset
+    if kwargs.get("url") and kwargs["url"] != "":
+        kwargs["download_url"] = kwargs["url"]
+    else:
+        kwargs["download_url"] = f"https://data.aifarms.org/download/{dataset}"
+    
     keywords = set(["AIFARMS"])
     keywords.update(kwargs.get("keywords", ""))
     kwargs["aifarms_keywords"] = keywords
@@ -263,7 +269,7 @@ def downloads():
 def serve_image(dataset, name):
     import mimetypes
     from flask import abort, send_file
-    allowed_exts = {".png", ".jpg", ".jpeg"}
+    allowed_exts = {".png", ".jpg", ".jpeg", ".gif"}
     ext = os.path.splitext(name)[1].lower()
     if ext not in allowed_exts:
         abort(404)

templates/croissant.json

@@ -8,7 +8,9 @@
     "conformsTo": "http://mlcommons.org/croissant/1.0",
     "description": "{{ short_description }}",
     "citeAs": "{{ citation }}",
+    {% if license and license != 'N/A' and license != '' %}
     "license": "https://data.aifarms.org/license/{{ dataset }}",
+    {% endif %}
     "url": "https://data.aifarms.org/view/{{ dataset }}",
     "datePublished": "{{ created }}",
     "creator": [
@@ -28,8 +30,10 @@
       {
         "@type": "cr:FileSet",
         "@id": "{{ dataset }}.zip",
-        "contentUrl": "https://data.aifarms.org/download/{{ dataset }}",
+        "contentUrl": "{{ download_url }}",
+        {% if filesize and filesize != 'N/A' and filesize != '' %}
         "contentSize": "{{ filesize }}",
+        {% endif %}
         "encodingFormat": "application/x-zip-compressed"
       }
     ],

templates/view.html

@@ -38,8 +38,8 @@
       <div id="nextToCarousel" class="col-3 position-absolute top-0 end-0" >
         <div class="vstack gap-3">
           <row>
-            {% if filesize and filesize != 'N/A' and filesize != '' %}
-            <a href="download/{{ dataset }}"><button type="submit" data-bs-toggle="tooltip" data-bs-placement="top" 
+            {% if (filesize and filesize != 'N/A' and filesize != '') or (url and url != '') %}
+            <a href="{{ download_url }}"><button type="submit" data-bs-toggle="tooltip" data-bs-placement="top" 
               title="Download" class="btn btn-secondary bi bi-cloud-download"></button></a>
             {% endif %}
             {% if license and license != 'N/A' and license != '' %}