diff --git a/pyproject.toml b/pyproject.toml index 6e69630..01f510d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "web-sand" -version = "4.0.0" +version = "4.0.1" description = "UI for browsing/editing semantic descriptions" authors = ["Binh Vu "] repository = "https://github.com/usc-isi-i2/sand" @@ -16,7 +16,7 @@ sand = 'sand.__main__:cli' # restricting the upper bound python version to 3.12, due to RestrictedPython dependency. python = ">=3.9, <3.12" kgdata = "^6.0.0" -sem-desc = "^6.0.0" +sem-desc = "^6.8.0" peewee = "^3.15.2" Flask = "^2.2.2" python-dotenv = ">= 0.19.0, < 0.20.0" @@ -25,7 +25,7 @@ gena = "^1.6.4" loguru = "^0.7.0" orjson = ">= 3.9.0, < 4.0.0" drepr = "^2.10.0" -rsoup = "^3.0.2" +rsoup = "^3.1.7" nh3 = "^0.2.13" RestrictedPython = "^6.1" diff --git a/sand/commands/load.py b/sand/commands/load.py index 80c59b2..04308c0 100644 --- a/sand/commands/load.py +++ b/sand/commands/load.py @@ -67,16 +67,14 @@ def convert_linked_table(tbl: FullTable) -> Tuple[Table, List[TableRow]]: Note that the project of the table is not set, which is supposed to be set later. """ context_values = [ - Value("entityid", str(entityid)) for entityid in tbl.context.page_entities + Value("entityid", str(entityid)) for entityid in tbl.context.entities ] if tbl.context.page_url is not None: context_page = ContextPage( tbl.context.page_url, tbl.context.page_title or "", - str(tbl.context.page_entities[0]) - if len(tbl.context.page_entities) > 0 - else None, + (str(tbl.context.entities[0]) if len(tbl.context.entities) > 0 else None), ) else: context_page = None diff --git a/sand/serializer.py b/sand/serializer.py index 04b4c98..a9b44ee 100644 --- a/sand/serializer.py +++ b/sand/serializer.py @@ -80,10 +80,7 @@ def serialize_graph( { "id": str(n.id), "uri": n.abs_uri, - "label": assert_not_null(n.readable_label), - # "label": tmp.readable_label - # if (tmp := ontclass_ar.get_by_uri(n.abs_uri)) is not None - # else n.rel_uri, + "label": n.label, "approximation": n.approximation, "type": "class_node", } @@ -121,7 +118,7 @@ def serialize_graph( "source": str(e.source), "target": str(e.target), "uri": e.abs_uri, - "label": assert_not_null(e.readable_label), + "label": e.label, # "label": e.readable_label # or ( # tmp.readable_label