@prefix : <http://www.gsi.upm.es/onto/senpy/ns#> .\n",
"@prefix dc: <http://dublincore.org/2012/06/14/dcelements#> .\n",
- "@prefix emoml: <http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/emotionml/ns#> .\n",
+ "@prefix emoml: <http://www.gsi.upm.es/ontologies/onyx/vocabularies/emotionml/ns#> .\n",
"@prefix endpoint: <http://senpy.gsi.upm.es/api/> .\n",
"@prefix fam: <http://vocab.fusepool.info/fam#> .\n",
- "@prefix marl: <http://www.gsi.dit.upm.es/ontologies/marl/ns#> .\n",
+ "@prefix marl: <http://www.gsi.upm.es/ontologies/marl/ns#> .\n",
"@prefix nif: <http://persistence.uni-leipzig.org/nlp2rdf/ontologies/nif-core#> .\n",
- "@prefix onyx: <http://www.gsi.dit.upm.es/ontologies/onyx/ns#> .\n",
+ "@prefix onyx: <http://www.gsi.upm.es/ontologies/onyx/ns#> .\n",
"@prefix prefix: <http://senpy.invalid/> .\n",
"@prefix prov: <http://www.w3.org/ns/prov#> .\n",
"@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .\n",
"@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .\n",
"@prefix senpy: <http://www.gsi.upm.es/onto/senpy/ns#> .\n",
- "@prefix wna: <http://www.gsi.dit.upm.es/ontologies/wnaffect/ns#> .\n",
+ "@prefix wna: <http://www.gsi.upm.es/ontologies/wnaffect/ns#> .\n",
"@prefix xml: <http://www.w3.org/XML/1998/namespace> .\n",
"@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .\n",
"\n",
@@ -362,18 +362,18 @@
"\\begin{Verbatim}[commandchars=\\\\\\{\\}]\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.upm.es/onto/senpy/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{dc:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://dublincore.org/2012/06/14/dcelements\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
- "\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{emoml:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/emotionml/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
+ "\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{emoml:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/emotionml/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{endpoint:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://senpy.gsi.upm.es/api/\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{fam:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://vocab.fusepool.info/fam\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
- "\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{marl:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.dit.upm.es/ontologies/marl/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
+ "\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{marl:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.upm.es/ontologies/marl/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{nif:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://persistence.uni\\PYZhy{}leipzig.org/nlp2rdf/ontologies/nif\\PYZhy{}core\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
- "\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{onyx:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.dit.upm.es/ontologies/onyx/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
+ "\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{onyx:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.upm.es/ontologies/onyx/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{prefix:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://senpy.invalid/\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{prov:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.w3.org/ns/prov\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{rdf:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.w3.org/1999/02/22\\PYZhy{}rdf\\PYZhy{}syntax\\PYZhy{}ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{rdfs:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.w3.org/2000/01/rdf\\PYZhy{}schema\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{senpy:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.upm.es/onto/senpy/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
- "\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{wna:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.dit.upm.es/ontologies/wnaffect/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
+ "\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{wna:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.gsi.upm.es/ontologies/wnaffect/ns\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{xml:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.w3.org/XML/1998/namespace\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\\PY{k}{@prefix}\\PY{+w}{ }\\PY{n+nn}{xsd:}\\PY{+w}{ }\\PY{n+nv}{\\PYZlt{}http://www.w3.org/2001/XMLSchema\\PYZsh{}\\PYZgt{}}\\PY{+w}{ }\\PY{p}{.}\n",
"\n",
@@ -390,18 +390,18 @@
"text/plain": [
"@prefix : .\n",
"@prefix dc: .\n",
- "@prefix emoml: .\n",
+ "@prefix emoml: .\n",
"@prefix endpoint: .\n",
"@prefix fam: .\n",
- "@prefix marl: .\n",
+ "@prefix marl: .\n",
"@prefix nif: .\n",
- "@prefix onyx: .\n",
+ "@prefix onyx: .\n",
"@prefix prefix: .\n",
"@prefix prov: .\n",
"@prefix rdf: .\n",
"@prefix rdfs: .\n",
"@prefix senpy: .\n",
- "@prefix wna: .\n",
+ "@prefix wna: .\n",
"@prefix xml: .\n",
"@prefix xsd: .\n",
"\n",
@@ -1187,9 +1187,9 @@
" {\n",
" "@id": "Emotion0",\n",
" "@type": "Emotion",\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal": 6.44,\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance": 7.11,\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#valence": 8.72,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal": 6.44,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance": 7.11,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#valence": 8.72,\n",
" "prov:wasGeneratedBy": "prefix:Analysis_1563372854.2822595"\n",
" }\n",
" ],\n",
@@ -1220,9 +1220,9 @@
" \\PY{p}{\\PYZob{}}\n",
" \\PY{n+nd}{\\PYZdq{}@id\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}Emotion0\\PYZdq{}}\\PY{p}{,}\n",
" \\PY{n+nd}{\\PYZdq{}@type\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}Emotion\\PYZdq{}}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}arousal\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{6.44}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}dominance\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{7.11}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}valence\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{8.72}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}arousal\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{6.44}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}dominance\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{7.11}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}valence\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{8.72}\\PY{p}{,}\n",
" \\PY{n+nt}{\\PYZdq{}prov:wasGeneratedBy\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}prefix:Analysis\\PYZus{}1563372854.2822595\\PYZdq{}}\n",
" \\PY{p}{\\PYZcb{}}\n",
" \\PY{p}{]}\\PY{p}{,}\n",
@@ -1252,9 +1252,9 @@
" {\n",
" \"@id\": \"Emotion0\",\n",
" \"@type\": \"Emotion\",\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal\": 6.44,\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance\": 7.11,\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#valence\": 8.72,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal\": 6.44,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance\": 7.11,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#valence\": 8.72,\n",
" \"prov:wasGeneratedBy\": \"prefix:Analysis_1563372854.2822595\"\n",
" }\n",
" ],\n",
@@ -1376,9 +1376,9 @@
" {\n",
" "@id": "Emotion0",\n",
" "@type": "Emotion",\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal": 6.44,\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance": 7.11,\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#valence": 8.72,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal": 6.44,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance": 7.11,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#valence": 8.72,\n",
" "prov:wasGeneratedBy": "prefix:Analysis_1563372854.3354168"\n",
" }\n",
" ],\n",
@@ -1409,9 +1409,9 @@
" \\PY{p}{\\PYZob{}}\n",
" \\PY{n+nd}{\\PYZdq{}@id\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}Emotion0\\PYZdq{}}\\PY{p}{,}\n",
" \\PY{n+nd}{\\PYZdq{}@type\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}Emotion\\PYZdq{}}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}arousal\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{6.44}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}dominance\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{7.11}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}valence\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{8.72}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}arousal\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{6.44}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}dominance\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{7.11}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}valence\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{8.72}\\PY{p}{,}\n",
" \\PY{n+nt}{\\PYZdq{}prov:wasGeneratedBy\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}prefix:Analysis\\PYZus{}1563372854.3354168\\PYZdq{}}\n",
" \\PY{p}{\\PYZcb{}}\n",
" \\PY{p}{]}\\PY{p}{,}\n",
@@ -1441,9 +1441,9 @@
" {\n",
" \"@id\": \"Emotion0\",\n",
" \"@type\": \"Emotion\",\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal\": 6.44,\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance\": 7.11,\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#valence\": 8.72,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal\": 6.44,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance\": 7.11,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#valence\": 8.72,\n",
" \"prov:wasGeneratedBy\": \"prefix:Analysis_1563372854.3354168\"\n",
" }\n",
" ],\n",
@@ -1572,9 +1572,9 @@
" {\n",
" "@id": "Emotion0",\n",
" "@type": "Emotion",\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal": 6.44,\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance": 7.11,\n",
- " "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#valence": 8.72,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal": 6.44,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance": 7.11,\n",
+ " "http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#valence": 8.72,\n",
" "prov:wasGeneratedBy": "prefix:Analysis_1563372854.3876536"\n",
" }\n",
" ],\n",
@@ -1605,9 +1605,9 @@
" \\PY{p}{\\PYZob{}}\n",
" \\PY{n+nd}{\\PYZdq{}@id\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}Emotion0\\PYZdq{}}\\PY{p}{,}\n",
" \\PY{n+nd}{\\PYZdq{}@type\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}Emotion\\PYZdq{}}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}arousal\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{6.44}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}dominance\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{7.11}\\PY{p}{,}\n",
- " \\PY{n+nt}{\\PYZdq{}http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}valence\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{8.72}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}arousal\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{6.44}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}dominance\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{7.11}\\PY{p}{,}\n",
+ " \\PY{n+nt}{\\PYZdq{}http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns\\PYZsh{}valence\\PYZdq{}}\\PY{p}{:} \\PY{l+m+mf}{8.72}\\PY{p}{,}\n",
" \\PY{n+nt}{\\PYZdq{}prov:wasGeneratedBy\\PYZdq{}}\\PY{p}{:} \\PY{l+s+s2}{\\PYZdq{}prefix:Analysis\\PYZus{}1563372854.3876536\\PYZdq{}}\n",
" \\PY{p}{\\PYZcb{}}\n",
" \\PY{p}{]}\\PY{p}{,}\n",
@@ -1637,9 +1637,9 @@
" {\n",
" \"@id\": \"Emotion0\",\n",
" \"@type\": \"Emotion\",\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal\": 6.44,\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance\": 7.11,\n",
- " \"http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/anew/ns#valence\": 8.72,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#arousal\": 6.44,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#dominance\": 7.11,\n",
+ " \"http://www.gsi.upm.es/ontologies/onyx/vocabularies/anew/ns#valence\": 8.72,\n",
" \"prov:wasGeneratedBy\": \"prefix:Analysis_1563372854.3876536\"\n",
" }\n",
" ],\n",
diff --git a/docs/examples/results/example-pad.json b/docs/examples/results/example-pad.json
index 63beac8..57a119c 100644
--- a/docs/examples/results/example-pad.json
+++ b/docs/examples/results/example-pad.json
@@ -2,7 +2,7 @@
"@context": [
"http://mixedemotions-project.eu/ns/context.jsonld",
{
- "emovoc": "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/emotionml/ns#"
+ "emovoc": "http://www.gsi.upm.es/ontologies/onyx/vocabularies/emotionml/ns#"
}
],
"@id": "me:Result1",
diff --git a/docs/index.rst b/docs/index.rst
index e7c8e06..ddd1212 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -67,7 +67,7 @@ You can analyze the same sentence using a different sentiment service (e.g. Vade
@prefix : .
@prefix endpoint: .
- @prefix marl: .
+ @prefix marl: .
@prefix nif: .
@prefix prefix: .
@prefix prov: .
diff --git a/docs/installation.rst b/docs/installation.rst
index 983633a..53f79ba 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -49,7 +49,7 @@ To use your custom plugins, you can add volume to the container:
.. code:: bash
- docker run -ti -p 5000:5000 -v :/plugins gsiupm/senpy --host 0.0.0.0 --plugins -f /plugins
+ docker run -ti -p 5000:5000 -v :/plugins gsiupm/senpy --host 0.0.0.0 --plugins-folder /plugins
Alias
diff --git a/docs/publications.rst b/docs/publications.rst
index a3cb4ea..f994aaf 100644
--- a/docs/publications.rst
+++ b/docs/publications.rst
@@ -2,7 +2,7 @@ Publications
============
-And if you use Senpy in your research, please cite `Senpy: A Pragmatic Linked Sentiment Analysis Framework `__ (`BibTex `__):
+And if you use Senpy in your research, please cite `Senpy: A Pragmatic Linked Sentiment Analysis Framework `__ (`BibTex `__):
.. code-block:: text
diff --git a/docs/vocabularies.rst b/docs/vocabularies.rst
index e55ad36..eddf04a 100644
--- a/docs/vocabularies.rst
+++ b/docs/vocabularies.rst
@@ -13,9 +13,9 @@ An overview of the vocabularies and their use can be found in [4].
[1] Guidelines for developing NIF-based NLP services, Final Community Group Report 22 December 2015 Available at: https://www.w3.org/2015/09/bpmlod-reports/nif-based-nlp-webservices/
-[2] Marl Ontology Specification, available at http://www.gsi.dit.upm.es/ontologies/marl/
+[2] Marl Ontology Specification, available at http://www.gsi.upm.es/ontologies/marl/
-[3] Onyx Ontology Specification, available at http://www.gsi.dit.upm.es/ontologies/onyx/
+[3] Onyx Ontology Specification, available at http://www.gsi.upm.es/ontologies/onyx/
[4] Iglesias, C. A., Sánchez-Rada, J. F., Vulcu, G., & Buitelaar, P. (2017). Linked Data Models for Sentiment and Emotion Analysis in Social Networks. In Sentiment Analysis in Social Networks (pp. 49-69).
diff --git a/extra-requirements.txt b/extra-requirements.txt
index 1eac27a..59061d5 100644
--- a/extra-requirements.txt
+++ b/extra-requirements.txt
@@ -1 +1,2 @@
gsitk>0.1.9.1
+flask_cors==3.0.10
diff --git a/k8s/senpy-ingress.yaml b/k8s/senpy-ingress.yaml
index c46c129..656ddb8 100644
--- a/k8s/senpy-ingress.yaml
+++ b/k8s/senpy-ingress.yaml
@@ -5,7 +5,7 @@ metadata:
name: senpy-ingress
spec:
rules:
- - host: latest.senpy.cluster.gsi.dit.upm.es
+ - host: latest.senpy.gsi.upm.es
http:
paths:
- path: /
diff --git a/requirements.txt b/requirements.txt
index 72164ce..b26068b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,8 +7,7 @@ future
jsonschema
jsonref
PyYAML
-rdflib
-rdflib-jsonld
+rdflib==6.1.1
numpy
scipy
scikit-learn>=0.20
diff --git a/senpy/__main__.py b/senpy/__main__.py
index bb5d1d1..c08c03f 100644
--- a/senpy/__main__.py
+++ b/senpy/__main__.py
@@ -41,6 +41,11 @@ def main():
type=str,
default="INFO",
help='Logging level')
+ parser.add_argument(
+ '--no-proxy-fix',
+ action='store_true',
+ default=False,
+ help='Do not assume senpy will be running behind a proxy (e.g., nginx)')
parser.add_argument(
'--log-format',
metavar='log_format',
@@ -127,6 +132,12 @@ def main():
action='store_true',
default=False,
help='Do not exit if some plugins fail to activate')
+ parser.add_argument(
+ '--enable-cors',
+ '--cors',
+ action='store_true',
+ default=False,
+ help='Enable CORS for all domains (requires flask-cors to be installed)')
args = parser.parse_args()
print('Senpy version {}'.format(senpy.__version__))
print(sys.version)
@@ -141,6 +152,7 @@ def main():
app = Flask(__name__)
app.debug = args.debug
+
sp = Senpy(app,
plugin_folder=None,
default_plugins=not args.no_default_plugins,
@@ -177,6 +189,14 @@ def main():
print('Senpy version {}'.format(senpy.__version__))
print('Server running on port %s:%d. Ctrl+C to quit' % (args.host,
args.port))
+ if args.enable_cors:
+ from flask_cors import CORS
+ CORS(app)
+
+ if not args.no_proxy_fix:
+ from werkzeug.middleware.proxy_fix import ProxyFix
+ app.wsgi_app = ProxyFix(app.wsgi_app)
+
try:
app.run(args.host,
args.port,
diff --git a/senpy/models.py b/senpy/models.py
index 5b42b86..42a336f 100644
--- a/senpy/models.py
+++ b/senpy/models.py
@@ -216,7 +216,7 @@ class BaseModel(with_metaclass(BaseMeta, CustomDict)):
logger.debug(
'Parsing with prefix: {}'.format(kwargs.get('prefix')))
content = g.serialize(format=format,
- prefix=prefix).decode('utf-8')
+ prefix=prefix)
mimetype = 'text/{}'.format(format)
else:
raise Error('Unknown outformat: {}'.format(format))
diff --git a/senpy/schemas/context.jsonld b/senpy/schemas/context.jsonld
index 7194262..6f274bd 100644
--- a/senpy/schemas/context.jsonld
+++ b/senpy/schemas/context.jsonld
@@ -5,10 +5,10 @@
"senpy": "http://www.gsi.upm.es/onto/senpy/ns#",
"prov": "http://www.w3.org/ns/prov#",
"nif": "http://persistence.uni-leipzig.org/nlp2rdf/ontologies/nif-core#",
- "marl": "http://www.gsi.dit.upm.es/ontologies/marl/ns#",
- "onyx": "http://www.gsi.dit.upm.es/ontologies/onyx/ns#",
- "wna": "http://www.gsi.dit.upm.es/ontologies/wnaffect/ns#",
- "emoml": "http://www.gsi.dit.upm.es/ontologies/onyx/vocabularies/emotionml/ns#",
+ "marl": "http://www.gsi.upm.es/ontologies/marl/ns#",
+ "onyx": "http://www.gsi.upm.es/ontologies/onyx/ns#",
+ "wna": "http://www.gsi.upm.es/ontologies/wnaffect/ns#",
+ "emoml": "http://www.gsi.upm.es/ontologies/onyx/vocabularies/emotionml/ns#",
"xsd": "http://www.w3.org/2001/XMLSchema#",
"fam": "http://vocab.fusepool.info/fam#",
"topics": {
diff --git a/senpy/static/js/main.js b/senpy/static/js/main.js
index 0951bc2..605d2fd 100644
--- a/senpy/static/js/main.js
+++ b/senpy/static/js/main.js
@@ -1,4 +1,4 @@
-var ONYX = "http://www.gsi.dit.upm.es/ontologies/onyx/ns#";
+var ONYX = "http://www.gsi.upm.es/ontologies/onyx/ns#";
var RDF_TYPE = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
var plugins_params = default_params = {};
var plugins = [];
diff --git a/senpy/static/js/nodes.js b/senpy/static/js/nodes.js
index dd844eb..943ed91 100644
--- a/senpy/static/js/nodes.js
+++ b/senpy/static/js/nodes.js
@@ -1,7 +1,7 @@
ns = {
- 'http://www.gsi.dit.upm.es/ontologies/marl/ns#': 'marl',
- 'http://www.gsi.dit.upm.es/ontologies/onyx/ns#': 'onyx',
- 'http://www.gsi.dit.upm.es/ontologies/senpy/ns#': 'onyx',
+ 'http://www.gsi.upm.es/ontologies/marl/ns#': 'marl',
+ 'http://www.gsi.upm.es/ontologies/onyx/ns#': 'onyx',
+ 'http://www.gsi.upm.es/ontologies/senpy/ns#': 'onyx',
'http://www.gsi.upm.es/onto/senpy/ns#': 'senpy',
'http://www.w3.org/ns/prov#': 'prov',
'http://persistence.uni-leipzig.org/nlp2rdf/ontologies/nif-core#': 'nif'
diff --git a/senpy/templates/index.html b/senpy/templates/index.html
index 055620e..535b347 100755
--- a/senpy/templates/index.html
+++ b/senpy/templates/index.html
@@ -326,7 +326,7 @@ In Data Science and Advanced Analytics (DSAA),