simplify download url, more links

Author: robkooper

app.py

@@ -69,6 +69,26 @@ def render_template(template, dataset):
         kwargs["datasheet"] = True
     else:
         kwargs["datasheet"] = False
+    # Check for dataset.zip file
+    zipfile = os.path.join(dataset_folder, "dataset.zip")
+    if os.path.exists(zipfile):
+        kwargs["filesize"] = sizeof_fmt(os.stat(zipfile).st_size)
+        kwargs["download_url"] = f"https://data.aifarms.org/download/{dataset}"
+    else:
+        kwargs["filesize"] = "N/A"
+        kwargs["download_url"] = ""
+
+    # Compute download_url based on presence of urls['download'] or urls['github']
+    urls = kwargs.get("urls", {})
+    if not kwargs["download_url"]:
+        if "download" in urls and urls["download"]:
+            kwargs["download_url"] = urls["download"]
+        elif "github" in urls and urls["github"]:
+            kwargs["download_url"] = urls["github"]
+
+    keywords = set(["AIFARMS"])
+    keywords.update(kwargs.get("keywords", ""))
+    kwargs["aifarms_keywords"] = keywords
 
     if template == "view.html":
         kwargs["title"] = f"{kwargs['title']} - AIFARMS Data Portal"
@@ -79,23 +99,6 @@ def render_template(template, dataset):
             else:
                 kwargs["contact"] = {"name": kwargs["contact"].strip(), "email": ""}
 
-    dataset_folder = os.path.join(DATASETS, dataset)
-    zipfile = os.path.join(dataset_folder, "dataset.zip")
-    if os.path.exists(zipfile):
-        kwargs["filesize"] = sizeof_fmt(os.stat(zipfile).st_size)
-    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
-    
     return flask.render_template(template, **kwargs)
 
 

data/datasets.json

@@ -16,7 +16,7 @@
       "email": "[email protected]"
     },
     "citation": "",
-    "keywords":["pigs"],
+    "keywords": ["pigs"],
     "funding": "This work is supported by Agriculture and Food Research Initiative (AFRI) grant no. 2020-67021-32799/project accession no.1024178 from the USDA National Institute of Food and Agriculture."
   },
   "slamdataset": {
@@ -37,11 +37,40 @@
     "short_description": "This dataset is intended for the evaluation of visual-based localization and mapping systems in agriculture.",
     "description": "This dataset is intended for the evaluation of visual-based localization and mapping systems in agriculture. It includes stereo images, IMU, GPS, and wheel encoder measurements. It was collected from a ground robot in the Illinois Autonomous Farm at the University of Illinois at Urbana-Champaign. The collection campaign took place during the Summer of 2022. Different data sequences were collected twice per week in corn fields, and less often in soybean and sorghum. This dataset exhibit high variability in terms of weather conditions and growth stages. It contains challenging features like occlusions, illumination variations, weeds, dynamic objects, and rough terrain.",
     "images": [],
-    "contact": { 
+    "contact": {
       "name": "Jose Cuaran"
     },
     "citation": "",
-    "keywords":[],
+    "keywords": [],
     "funding": "This work is supported by National Institute of Food and Agriculture grant no. 2020-67021- 32799"
+  },
+  "multi-camera-pig-tracking": {
+    "title": "Multi Camera Pig Tracking",
+    "preview": "image/multi-camera-pig-tracking/multicam-tracking.png",
+    "authors": [
+      "Aniket Shirke",
+      "J. Li",
+      "A. Green-Miller",
+      "T. Williams",
+      "X. Hu",
+      "A. Luthra",
+      "N. Ahuja",
+      "M. Caesar"
+    ],
+    "department": "",
+    "created": "Jul 1, 2021",
+    "short_description": "Tracking Grow-Finish Pigs Across Large Pens Using Multiple Cameras.",
+    "description": "",
+    "images": [],
+    "contact": {
+      "name": "Angela Green-Miller",
+      "email": "[email protected]"
+    },
+    "citation": "",
+    "keywords": ["pigs"],
+    "funding": "",
+    "urls": {
+      "github": "https://github.com/AIFARMS/multi-camera-pig-tracking"
+    }
   }
 }

data/multi-camera-pig-tracking/multicam-tracking.png

@@ -26,12 +26,12 @@
       {%- endif %}
       {%- endfor %}
     ],
-    {% if (url and url != '') or (filesize and filesize != 'N/A' and filesize != '') %}
+    {% if download_url %}
     "distribution": [
       {
         "@type": "cr:FileSet",
         "@id": "{{ dataset }}.zip",
-        "contentUrl": "{{ url if url and url != '' else download_url }}",
+        "contentUrl": "{{ download_url }}",
         {% if filesize and filesize != 'N/A' and filesize != '' %}
         "contentSize": "{{ filesize }}",
         {% endif %}
@@ -47,4 +47,4 @@
       {%- endif %}
       {%- endfor %}
     ]
-}
+}

templates/croissant.json

@@ -38,7 +38,7 @@
       <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 != '') or (url and url != '') %}
+            {% if download_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 %}
@@ -62,6 +62,17 @@
             {% endfor -%}
             </ul>
           </div>
+          {% if urls %}
+          <div><b>Links:</b>
+            <ul class="mb-0">
+              {% for key, value in urls.items() %}
+                {% if key != 'download' %}
+                  <li><a href="{{ value }}" target="_blank">{{ key|capitalize }}</a></li>
+                {% endif %}
+              {% endfor %}
+            </ul>
+          </div>
+          {% endif %}
           {% if filesize and filesize != 'N/A' and filesize != '' %}
           <div>Download Size: {{ filesize }}</div>
           {% endif %}