Skip to content

Commit 89bb606

Browse files
MartinKlMartinKl
authored
Merge pull request #498 from korpling/feature/whisper-segment-id-as-optional
Feature/whisper segment id as optional
2 parents e5a4143 + 5c85442 commit 89bb606

File tree

6 files changed

+409
-93
lines changed

6 files changed

+409
-93
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
- better documentation for `revise`
1111
- Add `diff`, a graph op that highlights editions between subgraphs with specific edge and node annotations
1212
- Add `edit` for directly manipulating the graph via graph updates
13+
- import `whisper`: More format flexibility (json keys can be skipped or have different names)
1314

1415
### Changed
1516

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ facet = "0.28.0"
2525
facet-reflect = "0.28.0"
2626
git2 = { version = "0.20.2", default-features = false }
2727
glob = "0.3"
28-
graphannis = { git = 'https://github.com/korpling/graphannis.git' }
29-
graphannis-core = { git = 'https://github.com/korpling/graphannis.git' }
28+
graphannis = "4.1.1"
29+
graphannis-core = "4.1.1"
3030
graphviz-rust = "0.9.0"
3131
indicatif = "0.17"
3232
itertools = "0.12"

‎src/importer/snapshots/annatto__importer__whisper__tests__flexibility.snap‎

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
---
2+
source: src/importer/whisper.rs
3+
expression: actual.unwrap()
4+
---
5+
---- flexibility.graphml:
6+
<?xml version="1.0" encoding="UTF-8"?>
7+
<graphml>
8+
<key id="k0" for="graph" attr.name="configuration" attr.type="string"/>
9+
<key id="k1" for="node" attr.name="annis::doc" attr.type="string"/>
10+
<key id="k2" for="node" attr.name="whisper::language" attr.type="string"/>
11+
<key id="k3" for="node" attr.name="annis::layer" attr.type="string"/>
12+
<key id="k4" for="node" attr.name="annis::node_type" attr.type="string"/>
13+
<key id="k5" for="node" attr.name="whisper::score" attr.type="string"/>
14+
<key id="k6" for="node" attr.name="whisper::segment" attr.type="string"/>
15+
<key id="k7" for="node" attr.name="annis::time" attr.type="string"/>
16+
<key id="k8" for="node" attr.name="annis::tok" attr.type="string"/>
17+
<graph edgedefault="directed" parse.order="nodesfirst" parse.nodeids="free" parse.edgeids="canonical">
18+
<data key="k0"><![CDATA[
19+
# configure visualizations here
20+
]]></data>
21+
<node id="flexibility">
22+
<data key="k4">corpus</data>
23+
</node>
24+
<node id="flexibility/example">
25+
<data key="k1">example</data>
26+
<data key="k2">pl</data>
27+
<data key="k4">corpus</data>
28+
</node>
29+
<node id="flexibility/example#datasource">
30+
<data key="k4">datasource</data>
31+
</node>
32+
<node id="flexibility/example#s0">
33+
<data key="k4">node</data>
34+
<data key="k6">Dies ist ein anderes Beispiel, siehste?</data>
35+
<data key="k7">11.26-12.982</data>
36+
</node>
37+
<node id="flexibility/example#t0-0">
38+
<data key="k3">default_layer</data>
39+
<data key="k4">node</data>
40+
<data key="k5">0.833</data>
41+
<data key="k7">11.26-11.38</data>
42+
<data key="k8">Dies</data>
43+
</node>
44+
<node id="flexibility/example#t0-1">
45+
<data key="k3">default_layer</data>
46+
<data key="k4">node</data>
47+
<data key="k5">0.915</data>
48+
<data key="k7">11.421-11.721</data>
49+
<data key="k8">ist</data>
50+
</node>
51+
<node id="flexibility/example#t0-2">
52+
<data key="k3">default_layer</data>
53+
<data key="k4">node</data>
54+
<data key="k5">0.683</data>
55+
<data key="k7">12.001-12.121</data>
56+
<data key="k8">ein</data>
57+
</node>
58+
<node id="flexibility/example#t0-3">
59+
<data key="k3">default_layer</data>
60+
<data key="k4">node</data>
61+
<data key="k5">0.935</data>
62+
<data key="k7">12.141-12.321</data>
63+
<data key="k8">anderes</data>
64+
</node>
65+
<node id="flexibility/example#t0-4">
66+
<data key="k3">default_layer</data>
67+
<data key="k4">node</data>
68+
<data key="k5">0.978</data>
69+
<data key="k7">12.361-12.661</data>
70+
<data key="k8">Beispiel,</data>
71+
</node>
72+
<node id="flexibility/example#t0-5">
73+
<data key="k3">default_layer</data>
74+
<data key="k4">node</data>
75+
<data key="k5">0.81</data>
76+
<data key="k7">12.741-12.982</data>
77+
<data key="k8">siehste?</data>
78+
</node>
79+
<node id="flexibility/example#s1">
80+
<data key="k4">node</data>
81+
<data key="k6">Wer&apos;s braucht ...</data>
82+
<data key="k7">13.022-14.502</data>
83+
</node>
84+
<node id="flexibility/example#t1-0">
85+
<data key="k3">default_layer</data>
86+
<data key="k4">node</data>
87+
<data key="k5">0.262</data>
88+
<data key="k7">13.022-13.162</data>
89+
<data key="k8">Wer&apos;s</data>
90+
</node>
91+
<node id="flexibility/example#t1-1">
92+
<data key="k3">default_layer</data>
93+
<data key="k4">node</data>
94+
<data key="k5">0.745</data>
95+
<data key="k7">13.202-14.502</data>
96+
<data key="k8">braucht</data>
97+
</node>
98+
<node id="flexibility/example#t1-2">
99+
<data key="k3">default_layer</data>
100+
<data key="k4">node</data>
101+
<data key="k8">...</data>
102+
</node>
103+
<edge id="e0" source="flexibility/example#s0" target="flexibility/example#t0-0" label="Coverage/annis/">
104+
</edge>
105+
<edge id="e1" source="flexibility/example#s0" target="flexibility/example#t0-1" label="Coverage/annis/">
106+
</edge>
107+
<edge id="e2" source="flexibility/example#s0" target="flexibility/example#t0-2" label="Coverage/annis/">
108+
</edge>
109+
<edge id="e3" source="flexibility/example#s0" target="flexibility/example#t0-3" label="Coverage/annis/">
110+
</edge>
111+
<edge id="e4" source="flexibility/example#s0" target="flexibility/example#t0-4" label="Coverage/annis/">
112+
</edge>
113+
<edge id="e5" source="flexibility/example#s0" target="flexibility/example#t0-5" label="Coverage/annis/">
114+
</edge>
115+
<edge id="e6" source="flexibility/example#s1" target="flexibility/example#t1-0" label="Coverage/annis/">
116+
</edge>
117+
<edge id="e7" source="flexibility/example#s1" target="flexibility/example#t1-1" label="Coverage/annis/">
118+
</edge>
119+
<edge id="e8" source="flexibility/example#s1" target="flexibility/example#t1-2" label="Coverage/annis/">
120+
</edge>
121+
<edge id="e9" source="flexibility/example#t0-0" target="flexibility/example#t0-1" label="Ordering/annis/">
122+
</edge>
123+
<edge id="e10" source="flexibility/example#t0-1" target="flexibility/example#t0-2" label="Ordering/annis/">
124+
</edge>
125+
<edge id="e11" source="flexibility/example#t0-2" target="flexibility/example#t0-3" label="Ordering/annis/">
126+
</edge>
127+
<edge id="e12" source="flexibility/example#t0-3" target="flexibility/example#t0-4" label="Ordering/annis/">
128+
</edge>
129+
<edge id="e13" source="flexibility/example#t0-4" target="flexibility/example#t0-5" label="Ordering/annis/">
130+
</edge>
131+
<edge id="e14" source="flexibility/example#t1-0" target="flexibility/example#t1-1" label="Ordering/annis/">
132+
</edge>
133+
<edge id="e15" source="flexibility/example#t1-1" target="flexibility/example#t1-2" label="Ordering/annis/">
134+
</edge>
135+
<edge id="e16" source="flexibility/example" target="flexibility" label="PartOf/annis/">
136+
</edge>
137+
<edge id="e17" source="flexibility/example#datasource" target="flexibility/example" label="PartOf/annis/">
138+
</edge>
139+
<edge id="e18" source="flexibility/example#s0" target="flexibility/example" label="PartOf/annis/">
140+
</edge>
141+
<edge id="e19" source="flexibility/example#t0-0" target="flexibility/example" label="PartOf/annis/">
142+
</edge>
143+
<edge id="e20" source="flexibility/example#t0-1" target="flexibility/example" label="PartOf/annis/">
144+
</edge>
145+
<edge id="e21" source="flexibility/example#t0-2" target="flexibility/example" label="PartOf/annis/">
146+
</edge>
147+
<edge id="e22" source="flexibility/example#t0-3" target="flexibility/example" label="PartOf/annis/">
148+
</edge>
149+
<edge id="e23" source="flexibility/example#t0-4" target="flexibility/example" label="PartOf/annis/">
150+
</edge>
151+
<edge id="e24" source="flexibility/example#t0-5" target="flexibility/example" label="PartOf/annis/">
152+
</edge>
153+
<edge id="e25" source="flexibility/example#s1" target="flexibility/example" label="PartOf/annis/">
154+
</edge>
155+
<edge id="e26" source="flexibility/example#t1-0" target="flexibility/example" label="PartOf/annis/">
156+
</edge>
157+
<edge id="e27" source="flexibility/example#t1-1" target="flexibility/example" label="PartOf/annis/">
158+
</edge>
159+
<edge id="e28" source="flexibility/example#t1-2" target="flexibility/example" label="PartOf/annis/">
160+
</edge>
161+
</graph>
162+
</graphml>

0 commit comments

Comments
 (0)