content negotiation try/except

Author: marqh

lib/bald/__init__.py

@@ -235,11 +235,15 @@ def __getitem__(self, item):
         if not self.is_http_uri(item):
             raise ValueError('{} is not a HTTP URI.'.format(item))
         if item not in self.cache:
-            headers = {'Accept': 'application/rdf+xml, text/html'}
             # import datetime
             # now = datetime.datetime.utcnow()
             # print('\ndownloading: {}'.format(item))
-            self.cache[item] = requests.get(item, headers=headers)
+            try:
+                headers = {'Accept': 'application/rdf+xml'}
+                self.cache[item] = requests.get(item, headers=headers)
+            except Exception:
+                headers = {'Accept': 'text/html'}
+                self.cache[item] = requests.get(item, headers=headers)
             # then = datetime.datetime.utcnow()
             # print('{}s'.format((then-now).total_seconds()))
 
@@ -696,10 +700,15 @@ def load_netcdf(afilepath, baseuri=None, alias_dict=None, cache=None):
 
         for alias in aliases:
             response = cache[aliases[alias]]
-            try:
-                aliasgraph.parse(data=response.text, format='xml')
-            except TypeError:
-                pass
+            aliasgraph.parse(data=response.text, format='xml')
+            # try:
+            #     import xml.sax._exceptions
+            #     aliasgraph.parse(data=response.text, format='xml')
+            # except TypeError:
+            #     pass
+            # except xml.sax._exceptions.SAXParseException:
+            #     import pdb; pdb.set_trace()
+            #     pass
         # if hasattr(fhandle, 'Conventions'):
         #     conventions = [c.strip() for c in fhandle.Conventions.split(',')]
         #     for conv in conventions:
@@ -751,7 +760,11 @@ def load_netcdf(afilepath, baseuri=None, alias_dict=None, cache=None):
 
         reference_prefixes = dict()
         reference_graph = copy.copy(aliasgraph)
-        reference_graph.parse('http://binary-array-ld.net/latest?_format=ttl')
+
+        response = cache['http://binary-array-ld.net/latest']
+        reference_graph.parse(data=response.text, format='xml')
+
+        # reference_graph.parse('http://binary-array-ld.net/latest?_format=ttl')
         qstr = ('prefix bald: <http://binary-array-ld.net/latest/> '
                 'prefix skos: <http://www.w3.org/2004/02/skos/core#> '
                 'select ?s '

lib/bald/tests/integration/HTML/hdf_container_nest.html

@@ -174,33 +174,33 @@
      return cell;
 };
 
-var file:///tmp/tmp9cq2_b_a.hdf/alocation = instance('file:///tmp/tmp9cq2_b_a.hdf/alocation:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="http://binary-array-ld.net/latest/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="http://binary-array-ld.net/latest/array" xlink:show=new text-decoration="underline">bald__array</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/anotherpair = instance('file:///tmp/tmp9cq2_b_a.hdf/anotherpair:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="http://binary-array-ld.net/latest/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="http://binary-array-ld.net/latest/array" xlink:show=new text-decoration="underline">bald__array</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 2'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/apair = instance('file:///tmp/tmp9cq2_b_a.hdf/apair:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 2'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/data = instance('file:///tmp/tmp9cq2_b_a.hdf/data:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/discovery = instance('file:///tmp/tmp9cq2_b_a.hdf/discovery:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/institution = instance('file:///tmp/tmp9cq2_b_a.hdf/institution:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |', '<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: a quality establishment'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/locref = instance('file:///tmp/tmp9cq2_b_a.hdf/locref:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |', '<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: for locational purposes'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/locref2 = instance('file:///tmp/tmp9cq2_b_a.hdf/locref2:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |', '<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: for more locational purposes'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/referencing = instance('file:///tmp/tmp9cq2_b_a.hdf/referencing:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/root = instance('file:///tmp/tmp9cq2_b_a.hdf/root:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
-var file:///tmp/tmp9cq2_b_a.hdf/source = instance('file:///tmp/tmp9cq2_b_a.hdf/source:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
-link(file:///tmp/tmp9cq2_b_a.hdf/alocation, file:///tmp/tmp9cq2_b_a.hdf/alocation, 'bald__array', 'bottom');
-link(file:///tmp/tmp9cq2_b_a.hdf/alocation, file:///tmp/tmp9cq2_b_a.hdf/locref, 'bald__references');
-link(file:///tmp/tmp9cq2_b_a.hdf/alocation, file:///tmp/tmp9cq2_b_a.hdf/locref2, 'bald__references');
-link(file:///tmp/tmp9cq2_b_a.hdf/anotherpair, file:///tmp/tmp9cq2_b_a.hdf/anotherpair, 'bald__array', 'bottom');
-link(file:///tmp/tmp9cq2_b_a.hdf/apair, file:///tmp/tmp9cq2_b_a.hdf/anotherpair, 'bald__references');
-link(file:///tmp/tmp9cq2_b_a.hdf/data, file:///tmp/tmp9cq2_b_a.hdf/alocation, 'bald__references');
-link(file:///tmp/tmp9cq2_b_a.hdf/discovery, file:///tmp/tmp9cq2_b_a.hdf/anotherpair, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/discovery, file:///tmp/tmp9cq2_b_a.hdf/apair, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/discovery, file:///tmp/tmp9cq2_b_a.hdf/source, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/referencing, file:///tmp/tmp9cq2_b_a.hdf/locref, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/referencing, file:///tmp/tmp9cq2_b_a.hdf/locref2, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/root, file:///tmp/tmp9cq2_b_a.hdf/alocation, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/root, file:///tmp/tmp9cq2_b_a.hdf/data, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/root, file:///tmp/tmp9cq2_b_a.hdf/discovery, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/root, file:///tmp/tmp9cq2_b_a.hdf/referencing, 'bald__contains', 'top', true);
-link(file:///tmp/tmp9cq2_b_a.hdf/source, file:///tmp/tmp9cq2_b_a.hdf/institution, 'bald__contains', 'top', true);
+var file:///tmp/tmp0ed878yz.hdf/alocation = instance('file:///tmp/tmp0ed878yz.hdf/alocation:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="http://binary-array-ld.net/latest/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="http://binary-array-ld.net/latest/array" xlink:show=new text-decoration="underline">bald__array</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/anotherpair = instance('file:///tmp/tmp0ed878yz.hdf/anotherpair:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>, <a xlink:href="http://binary-array-ld.net/latest/Reference" xlink:show=new text-decoration="underline">bald__Reference</a>', ['<a xlink:href="http://binary-array-ld.net/latest/array" xlink:show=new text-decoration="underline">bald__array</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 2'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/apair = instance('file:///tmp/tmp0ed878yz.hdf/apair:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 2'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/data = instance('file:///tmp/tmp0ed878yz.hdf/data:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/references" xlink:show=new text-decoration="underline">bald__references</a>: |', '<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: 11, 17'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/discovery = instance('file:///tmp/tmp0ed878yz.hdf/discovery:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/institution = instance('file:///tmp/tmp0ed878yz.hdf/institution:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |', '<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: a quality establishment'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/locref = instance('file:///tmp/tmp0ed878yz.hdf/locref:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |', '<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: for locational purposes'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/locref2 = instance('file:///tmp/tmp0ed878yz.hdf/locref2:<a xlink:href="http://binary-array-ld.net/latest/Array" xlink:show=new text-decoration="underline">bald__Array</a>', ['<a xlink:href="http://binary-array-ld.net/latest/shape" xlink:show=new text-decoration="underline">bald__shape</a>: |', '<a xlink:href="http://www.w3.org/2004/02/skos/core#prefLabel" xlink:show=new text-decoration="underline">skos__prefLabel</a>: for more locational purposes'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/referencing = instance('file:///tmp/tmp0ed878yz.hdf/referencing:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/root = instance('file:///tmp/tmp0ed878yz.hdf/root:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
+var file:///tmp/tmp0ed878yz.hdf/source = instance('file:///tmp/tmp0ed878yz.hdf/source:<a xlink:href="http://binary-array-ld.net/latest/Container" xlink:show=new text-decoration="underline">bald__Container</a>', ['<a xlink:href="http://binary-array-ld.net/latest/contains" xlink:show=new text-decoration="underline">bald__contains</a>: |'], '#878800');
+link(file:///tmp/tmp0ed878yz.hdf/alocation, file:///tmp/tmp0ed878yz.hdf/alocation, 'bald__array', 'bottom');
+link(file:///tmp/tmp0ed878yz.hdf/alocation, file:///tmp/tmp0ed878yz.hdf/locref, 'bald__references');
+link(file:///tmp/tmp0ed878yz.hdf/alocation, file:///tmp/tmp0ed878yz.hdf/locref2, 'bald__references');
+link(file:///tmp/tmp0ed878yz.hdf/anotherpair, file:///tmp/tmp0ed878yz.hdf/anotherpair, 'bald__array', 'bottom');
+link(file:///tmp/tmp0ed878yz.hdf/apair, file:///tmp/tmp0ed878yz.hdf/anotherpair, 'bald__references');
+link(file:///tmp/tmp0ed878yz.hdf/data, file:///tmp/tmp0ed878yz.hdf/alocation, 'bald__references');
+link(file:///tmp/tmp0ed878yz.hdf/discovery, file:///tmp/tmp0ed878yz.hdf/anotherpair, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/discovery, file:///tmp/tmp0ed878yz.hdf/apair, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/discovery, file:///tmp/tmp0ed878yz.hdf/source, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/referencing, file:///tmp/tmp0ed878yz.hdf/locref, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/referencing, file:///tmp/tmp0ed878yz.hdf/locref2, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/root, file:///tmp/tmp0ed878yz.hdf/alocation, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/root, file:///tmp/tmp0ed878yz.hdf/data, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/root, file:///tmp/tmp0ed878yz.hdf/discovery, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/root, file:///tmp/tmp0ed878yz.hdf/referencing, 'bald__contains', 'top', true);
+link(file:///tmp/tmp0ed878yz.hdf/source, file:///tmp/tmp0ed878yz.hdf/institution, 'bald__contains', 'top', true);
     joint.layout.DirectedGraph.layout(graph, { setLinkVertices: false,
                                                nodeSep: 150, rankSep: 100,
                                                marginX: 100, marginY: 100,