#65 skosprovider 1.1.0, rdflib 5.0.0

.travis.yml

@@ -1,10 +1,9 @@
 sudo: false
 language: python
 python:
-- 2.7
-- 3.4
-- 3.5
 - 3.6
+- 3.8
+- 3.9
 install:
 - pip install -U setuptools
 - pip install -r requirements.txt #fix versions

requirements.txt

@@ -1,4 +1,4 @@
 requests==2.26.0
-skosprovider==1.0.0
+skosprovider==1.1.0
 #-e git+https://github.com/koenedaele/skosprovider.git#egg=skosprovider
-rdflib==6.0.2
+rdflib==5.0.0

skosprovider_heritagedata/providers.py

@@ -215,7 +215,7 @@ def get_top_display(self, **kwargs):
         """  Returns all concepts or collections that form the top-level of a display hierarchy.
         :return: A :class:`lst` of concepts and collections.
         """
-        params = {'schemeURI': self.scheme_uri}
+        params = {'schemeURI': self.scheme_uri, 'alias': True}
         ret = self._get_items("getTopConceptsForScheme", params, **kwargs)
         language = self._get_language(**kwargs)
         sort = self._get_sort(**kwargs)
@@ -228,7 +228,7 @@ def get_children_display(self, id, **kwargs):
         :param str id: A concept or collection id.
         :returns: A :class:`lst` of concepts and collections.
         """
-        params = {'conceptURI': self.scheme_uri + "/concepts/" + id}
+        params = {'conceptURI': self.scheme_uri + "/concepts/" + id, 'alias': True}
         ret = self._get_items("getConceptRelations", params, **kwargs)
         language = self._get_language(**kwargs)
         sort = self._get_sort(**kwargs)
@@ -284,7 +284,7 @@ def _get_items(self, service, params, **kwargs):
 
         request = self.service_scheme_uri + "/" + service
         try:
-            res = self.session.get(request, params=params, allow_redirects=True)
+            res = self.session.get(request, params=params)
         except ConnectionError as e:
             raise ProviderUnavailableException(f"Request could not be executed - Request: {request} - Params: {params}")
         if res.status_code == 404:
@@ -303,24 +303,24 @@ def _get_items(self, service, params, **kwargs):
             property = None
             if 'property' in r.keys():
                 property = r['property']
-            if not service == 'getConceptRelations' or property == str(SKOS.narrower):
+            if not service == 'getConceptRelations' or property == "skos:narrower":
                 item = {
-                'id': _split_uri(uri, 1),
-                'uri': uri,
-                'type': 'concept',
-                'label': label,
-                'lang': language
+                    'id': _split_uri(uri, 1),
+                    'uri': uri,
+                    'type': 'concept',
+                    'label': label,
+                    'lang': language
                 }
-            if uri not in d:
-                d[uri] = item
-            if tags.tag(d[uri]['lang']).format == tags.tag(self._get_language(**kwargs)).format:
-                pass
-            elif tags.tag(item['lang']).format == tags.tag(self._get_language(**kwargs)).format:
-                d[uri] = item
-            elif tags.tag(item['lang']).language and (tags.tag(item['lang']).language.format == tags.tag(self._get_language(**kwargs)).language.format):
-                d[uri] = item
-            elif tags.tag(item['lang']).format == 'en':
-                d[uri] = item
+                if uri not in d:
+                    d[uri] = item
+                if tags.tag(d[uri]['lang']).format == tags.tag(self._get_language(**kwargs)).format:
+                    pass
+                elif tags.tag(item['lang']).format == tags.tag(self._get_language(**kwargs)).format:
+                    d[uri] = item
+                elif tags.tag(item['lang']).language and (tags.tag(item['lang']).language.format == tags.tag(self._get_language(**kwargs)).language.format):
+                    d[uri] = item
+                elif tags.tag(item['lang']).format == 'en':
+                    d[uri] = item
         return list(d.values())
 
     def _sort(self, items, sort, language='en', reverse=False):

skosprovider_heritagedata/utils.py

@@ -90,7 +90,7 @@ def things_from_graph(graph, concept_scheme):
 def _create_from_subject_typelist(graph, subject, typelist):
     list = []
     for p in typelist:
-        term = SKOS._NS.term(p)
+        term = SKOS.term(p)
         list.extend(_create_from_subject_predicate(graph, subject, term))
     return list
 
@@ -149,8 +149,7 @@ def uri_to_graph(uri, **kwargs):
         raise ProviderUnavailableException("URI not available: %s" % uri)
     if res.status_code == 404:
         return False
-    content_type = res.headers['Content-Type'].split(';')[0]
-    graph.parse(data=res.content, format=content_type)
+    graph.parse(data=res.content)
     # heritagedata.org returns a empy page/graph when a resource does not exists
     # (statsu_code 200). For this reason we return False if the graph is empty
     if len(graph) == 0: