udata 10.0.1.dev32457__py2.py3-none-any.whl → 10.0.2__py2.py3-none-any.whl

udata/__init__.py

@@ -4,5 +4,5 @@
 udata
 """
 
-__version__ = "10.0.1.dev"
+__version__ = "10.0.2"
 __description__ = "Open data portal"

udata/core/badges/models.py

@@ -83,5 +83,6 @@ class BadgeMixin:
 
     def badge_label(self, badge):
         """Display the badge label for a given kind"""
-        kind = badge.kind if isinstance(badge, self.badge) else badge
+        badge_model = self._fields["badges"].field.document_type
+        kind = badge.kind if isinstance(badge, badge_model) else badge
         return self.__badges__[kind]

udata/core/badges/tests/test_model.py

@@ -170,3 +170,11 @@ class BadgeMixinTest(DBTestMixin, TestCase):
         with self.assertRaises(db.ValidationError):
             fake = FakeBadge(kind="doesnotexist")
             fake.validate()
+
+    def test_badge_label(self):
+        """Should return the label for a given badge."""
+        fake = Fake.objects.create()
+        fake.add_badge(TEST)
+        assert fake.badge_label(TEST) == "Test"
+        badge = fake.badges[0]
+        assert fake.badge_label(badge) == "Test"

udata/core/dataservices/rdf.py

@@ -1,3 +1,4 @@
+from flask import current_app
 from rdflib import RDF, BNode, Graph, Literal, URIRef
 
 from udata.core.dataservices.models import Dataservice
@@ -145,8 +146,13 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
     # with some basic information about this dataset (but this will return a page
     # with more datasets than the page size… and could be problematic when processing the
     # correct Node with all the information in a future page)
-    for dataset in dataservice.datasets:
-        d.add(DCAT.servesDataset, dataset_to_graph_id(dataset))
+    if str(dataservice.id) == current_app.config["TABULAR_API_DATASERVICE_ID"]:
+        # TODO: remove this condition on TABULAR_API_DATASERVICE_ID.
+        # It is made to prevent having the graph explode due to too many datasets being served.
+        pass
+    else:
+        for dataset in dataservice.datasets:
+            d.add(DCAT.servesDataset, dataset_to_graph_id(dataset))
 
     contact_point = contact_point_to_rdf(dataservice.contact_point, graph)
     if contact_point:

udata/core/organization/rdf.py

@@ -49,7 +49,7 @@ def build_org_catalog(org, datasets, dataservices, format=None):
     for dataset in datasets:
         catalog.add(DCAT.dataset, dataset_to_rdf(dataset, graph))
     for dataservice in dataservices:
-        catalog.add(DCAT.dataservice, dataservice_to_rdf(dataservice, graph))
+        catalog.add(DCAT.service, dataservice_to_rdf(dataservice, graph))
 
     values = {"org": org.id}
 

udata/core/site/rdf.py

@@ -43,7 +43,7 @@ def build_catalog(site, datasets, dataservices=[], format=None):
 
     for dataservice in dataservices:
         rdf_dataservice = dataservice_to_rdf(dataservice, graph)
-        catalog.add(DCAT.DataService, rdf_dataservice)
+        catalog.add(DCAT.service, rdf_dataservice)
 
     if isinstance(datasets, Paginable):
         paginate_catalog(catalog, graph, datasets, format, "api.site_rdf_catalog_format")