change graph code

notebooks/example.ipynb

@@ -746,7 +746,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.10.11"
+ "version": "3.10.12"
  }
  },
  "nbformat": 4,

notebooks/memory_profiling.ipynb

@@ -445,7 +445,7 @@
  "name": "python",
  "nbconvert_exporter": "python",
  "pygments_lexer": "ipython3",
- "version": "3.10.11"
+ "version": "3.10.12"
  }
  },
  "nbformat": 4,

pyscal_rdf/graph.py

@@ -882,7 +882,11 @@ def query(self, inquery):
  """
  res = self.graph.query(inquery)
  if res is not None:
- return pd.DataFrame(res)
+ for line in inquery.split('\n'):
+ if 'SELECT DISTINCT' in line:
+ break
+ labels = [x[1:] for x in line.split()[2:]]
+ return pd.DataFrame(res, columns=labels)
  raise ValueError("SPARQL query returned None")
 
 

pyscal_rdf/network/network.py

@@ -15,12 +15,12 @@ class OntologyNetwork:
  """
  Network representation of Onto
  """
- def __init__(self, infile=None):
+ def __init__(self, infile=None, delimiter='/'):
  if infile is None:
  infile = owlfile
 
  self.g = nx.DiGraph()
- self.onto = OntoParser(infile)
+ self.onto = OntoParser(infile, delimiter=delimiter)
  self.data_prefix = 'value'
  self._parse_all()
 

pyscal_rdf/network/parser.py

@@ -10,6 +10,8 @@ class OntoParser:
  def __init__(self, infile, delimiter='/'):
  if os.path.exists(infile):
  self.tree = get_ontology(f'file://{infile}').load()
+ elif infile[:4] == 'http':
+ self.tree = get_ontology(infile)
  else:
  raise FileNotFoundError(f'file {infile} not found!')
  self.attributes = {}
@@ -131,10 +133,12 @@ def _parse_object_property(self):
  self.attributes['object_property'][term.name] = term
  for d in dm:
  if d!='07:owl#Thing':
- self.attributes['class'][d].is_range_of.append(term.name)
+ if d in self.attributes['class']:
+ self.attributes['class'][d].is_range_of.append(term.name)
  for r in rn:
  if r!='07:owl#Thing':
- self.attributes['class'][d].is_domain_of.append(term.name)
+ if d in self.attributes['class']:
+ self.attributes['class'][d].is_domain_of.append(term.name)
 
  def _parse_class_basic(self):
  classes = []