Merge pull request #495 from korpling/feature/raw-updates

Feature/raw updates

Author: MartinKl

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - better documentation for `revise`
 - Add `diff`, a graph op that highlights editions between subgraphs with specific edge and node annotations
+- Add `edit` for directly manipulating the graph via graph updates
 
 ### Changed
 

Cargo.toml

@@ -25,8 +25,8 @@ facet = "0.28.0"
 facet-reflect = "0.28.0"
 git2 = { version = "0.20.2", default-features = false }
 glob = "0.3"
-graphannis = "4.0.0"
-graphannis-core = "4.0.0"
+graphannis = { git = 'https://github.com/korpling/graphannis.git' }
+graphannis-core = { git = 'https://github.com/korpling/graphannis.git' }
 graphviz-rust = "0.9.0"
 indicatif = "0.17"
 itertools = "0.12"
@@ -57,6 +57,7 @@ tempfile = "3"
 termimad = "0.30"
 text-splitter = "0.6.3"
 thiserror = "1.0"
+time = "0.3.44"
 tokenizations = "0.4.2"
 toml = "0.8.0"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

docs/README.md

@@ -2,4 +2,4 @@
 |------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Import formats   | [conllu](importers/conllu.md), [exmaralda](importers/exmaralda.md), [git](importers/git.md), [graphml](importers/graphml.md), [meta](importers/meta.md), [none](importers/none.md), [opus](importers/opus.md), [path](importers/path.md), [ptb](importers/ptb.md), [relannis](importers/relannis.md), [saltxml](importers/saltxml.md), [table](importers/table.md), [text](importers/text.md), [textgrid](importers/textgrid.md), [toolbox](importers/toolbox.md), [treetagger](importers/treetagger.md), [webanno](importers/webanno.md), [whisper](importers/whisper.md), [xlsx](importers/xlsx.md), [xml](importers/xml.md) |
 | Export formats   | [conllu](exporters/conllu.md), [exmaralda](exporters/exmaralda.md), [graphml](exporters/graphml.md), [meta](exporters/meta.md), [saltxml](exporters/saltxml.md), [sequence](exporters/sequence.md), [table](exporters/table.md), [textgrid](exporters/textgrid.md), [treetagger](exporters/treetagger.md), [xlsx](exporters/xlsx.md)                                                                                                                                                                                                                                                                                           |
-| Graph operations | [align](graph_ops/align.md), [check](graph_ops/check.md), [collapse](graph_ops/collapse.md), [diff](graph_ops/diff.md), [filter](graph_ops/filter.md), [visualize](graph_ops/visualize.md), [enumerate](graph_ops/enumerate.md), [link](graph_ops/link.md), [map](graph_ops/map.md), [revise](graph_ops/revise.md), [time](graph_ops/time.md), [chunk](graph_ops/chunk.md), [split](graph_ops/split.md), [sleep](graph_ops/sleep.md), [none](graph_ops/none.md)                                                                                                                                                                |
+| Graph operations | [align](graph_ops/align.md), [check](graph_ops/check.md), [collapse](graph_ops/collapse.md), [diff](graph_ops/diff.md), [edit](graph_ops/edit.md), [filter](graph_ops/filter.md), [visualize](graph_ops/visualize.md), [enumerate](graph_ops/enumerate.md), [link](graph_ops/link.md), [map](graph_ops/map.md), [revise](graph_ops/revise.md), [time](graph_ops/time.md), [chunk](graph_ops/chunk.md), [split](graph_ops/split.md), [sleep](graph_ops/sleep.md), [none](graph_ops/none.md)                                                                                                                                     |

docs/graph_ops/edit.md

@@ -0,0 +1,97 @@
+# edit (graph_operation)
+
+Use this to directly edit the graph via graph update instructions.
+
+The following builds a graph and then reverts all steps back to the
+empty graph:
+
+```toml
+[[graph_op]]
+action = "edit"
+
+[[graph_op.config.instructions]] # note that you can define more than one node to be added for the same type 
+do = "add"
+nodes = ["a", "b"]
+node_type = "corpus"
+
+[[graph_op.config.instructions]] # note that theorectically you can define more than one node to be targeted by the annotation
+do = "add"
+nodes = ["a"]
+anno = "annis::doc"
+value = "a"
+
+[[graph_op.config.instructions]]
+do = "add"
+nodes = ["b"]
+anno = "annis::doc"
+value = "b"
+
+[[graph_op.config.instructions]]
+do = "add"
+nodes = ["a#t1", "a#t2", "b#t1", "b#t2"]
+
+[[graph_op.config.instructions]]  # Note that you can define more than one edge for a single instruction, as long as the component is the same
+do = "add"
+edges = [
+{ source = "a#t1", target = "a"},
+{ source = "a#t2", target = "a"},
+{ source = "b#t1", target = "b"},
+{ source = "b#t2", target = "b"}
+]
+component = { ctype = "PartOf", layer = "annis", name = "" }
+
+[[graph_op.config.instructions]]
+do = "add"
+edges = [{ source = "a#t2", target = "a#t1"}]
+component = { ctype = "Pointing", layer = "", name = "dep" }
+
+[[graph_op.config.instructions]]  # edge annotations also can target more than one edge
+do = "add"
+edges = [{ source = "a#t2", target = "a#t1"}]
+component = { ctype = "Pointing", layer = "", name = "dep" }
+anno = "default_ns::deprel"
+value = "subj"
+
+### now revert
+
+[[graph_op.config.instructions]]
+do = "rm"
+edges = [{ source = "a#t2", target = "a#t1"}]
+component = { ctype = "Pointing", layer = "", name = "dep" }
+annos = ["default_ns::deprel"]
+
+[[graph_op.config.instructions]]
+do = "rm"
+edges = [{ source = "a#t2", target = "a#t1"}]
+component = { ctype = "Pointing", layer = "", name = "dep" }
+
+[[graph_op.config.instructions]]
+do = "rm"
+edges = [
+{ source = "a#t1", target = "a"},
+{ source = "a#t2", target = "a"},
+{ source = "b#t1", target = "b"},
+{ source = "b#t2", target = "b"}
+]
+component = { ctype = "PartOf", layer = "annis", name = "" }
+
+[[graph_op.config.instructions]]
+do = "rm"
+nodes = ["a#t1", "a#t2", "b#t1", "b#t2"]
+
+[[graph_op.config.instructions]]
+do = "rm"
+nodes = ["a", "b"]
+annos = ["annis::doc"]
+
+[[graph_op.config.instructions]]
+do = "rm"
+nodes = ["a", "b"]
+```
+
+## Configuration
+
+###  instructions
+
+Provide a set of instructions.
+

src/estarde/mod.rs

@@ -1,5 +1,6 @@
 pub(crate) mod anno_key;
 pub(crate) mod annotation_component;
+pub(crate) mod update_event;
 
 pub trait IntoInner {
     type I;