Skip to content

Commit 297fbb2

Browse files
car031car031
committed
give a label to model and sampler types
1 parent e00a1c4 commit 297fbb2

File tree

8 files changed

+59
-38
lines changed

8 files changed

+59
-38
lines changed

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelProperties.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,16 @@ private void refresh() {
106106
SelectItem type = ItemFactory.newSelectItem(TYPE);
107107
type.setOptionDataSource(new ModelTypesDS());
108108
type.setValueField(VALUE);
109-
type.setDisplayField(VALUE);
109+
type.setDisplayField("label");
110110
type.setValue(model.getType());
111111
type.addChangedHandler(changedHandler);
112112
type.addChangedHandler(changed -> layersStack.setVisible(NEURAL.equals(type.getValueAsString())));
113113
type.setRequired(true);
114114
type.setDisabled(model.getId() != 0L);
115115
type.setVisible(model.getId() == 0L);
116116

117-
StaticTextItem typeValue = ItemFactory.newStaticTextItem("typeValue", TYPE, model.getType());
117+
StaticTextItem typeValue = ItemFactory.newStaticTextItem("typeValue", TYPE,
118+
I18N.message("aimodeltype." + model.getType()));
118119
typeValue.setVisible(model.getId() != 0L);
119120

120121
StaticTextItem id = ItemFactory.newStaticTextItem(ID, Long.toString(model.getId()));

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelTypesDS.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ private void init(String url) {
2323
value.setPrimaryKey(true);
2424
value.setRequired(true);
2525

26-
setFields(value);
26+
DataSourceTextField label = new DataSourceTextField("label");
27+
28+
setFields(value, label);
2729
setClientOnly(true);
2830

2931
setDataURL(url);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/model/ModelsPanel.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public void onDraw() {
103103

104104
ListGridField modelType = new ListGridField("type", I18N.message("type"));
105105
modelType.setAutoFit(AutoFitWidthApproach.BOTH);
106+
modelType.setCellFormatter((value, record, rowNum, colNum) -> I18N.message("aimodeltype." + value));
106107

107108
ListGridField training = new RunningListGridField(TRAINING);
108109
training.setTitle(I18N.message(TRAINING));
@@ -159,7 +160,7 @@ public void onDraw() {
159160
stats.setTitle(I18N.message("stats"));
160161
toolStrip.addButton(stats);
161162
stats.addClickHandler(event -> new AIStats().show());
162-
163+
163164
toolStrip.addSeparator();
164165

165166
ToolStripButton importModel = new ToolStripButton();
@@ -252,17 +253,16 @@ public void onSuccess(Void result) {
252253

253254
MenuItem evaluate = new MenuItem();
254255
evaluate.setTitle(I18N.message("startevaluation"));
255-
evaluate.addClickHandler(
256-
event -> LD.ask(I18N.message(QUESTION), I18N.message("confirmevaluation"), confirm -> {
257-
if (Boolean.TRUE.equals(confirm)) {
258-
AIService.Instance.get().evaluateModel(ids.get(0), new DefaultAsyncCallback<>() {
259-
@Override
260-
public void onSuccess(Void result) {
261-
// Nothing to do
262-
}
263-
});
256+
evaluate.addClickHandler(event -> LD.ask(I18N.message(QUESTION), I18N.message("confirmevaluation"), confirm -> {
257+
if (Boolean.TRUE.equals(confirm)) {
258+
AIService.Instance.get().evaluateModel(ids.get(0), new DefaultAsyncCallback<>() {
259+
@Override
260+
public void onSuccess(Void result) {
261+
// Nothing to do
264262
}
265-
}));
263+
});
264+
}
265+
}));
266266
evaluate.setEnabled(
267267
!selection[0].getAttributeAsBoolean(TRAINING) && !selection[0].getAttributeAsBoolean(EVALUATING)
268268
&& "neural".equals(selection[0].getAttributeAsString("type"))
@@ -305,11 +305,12 @@ public void onSuccess(GUIModel mdl) {
305305
}
306306

307307
protected void showModelDetails(GUIModel model) {
308-
if (!(details instanceof ModelDetailsPanel)) {
309-
detailsContainer.removeMember(details);
308+
detailsContainer.removeMember(details);
309+
if (model!=null)
310310
details = new ModelDetailsPanel(this);
311-
detailsContainer.addMember(details);
312-
}
311+
else
312+
details = SELECT_MODEL;
313+
detailsContainer.addMember(details);
313314
((ModelDetailsPanel) details).setModel(model);
314315
}
315316

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplerProperties.java‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,15 @@ private void refresh() {
106106
delimiter.setWidth(30);
107107
delimiter.setLength(2);
108108
delimiter.setStartRow(true);
109-
delimiter.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, CSV));
110-
delimiter.setRequiredWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, CSV));
109+
AdvancedCriteria delimiterCriteria = new AdvancedCriteria(TYPE, OperatorId.EQUALS, CSV);
110+
delimiter.setVisibleWhen(delimiterCriteria);
111+
delimiter.setRequiredWhen(delimiterCriteria);
111112

112113
TextItem quote = ItemFactory.newTextItem("quote", sampler.getQuote());
113114
quote.addChangedHandler(changedHandler);
114115
quote.setWidth(30);
115116
quote.setLength(2);
116-
quote.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, CSV));
117+
quote.setVisibleWhen(delimiterCriteria);
117118

118119
TextAreaItem description = ItemFactory.newTextAreaItem(DESCRIPTION, sampler.getDescription());
119120
description.addChangedHandler(changedHandler);
@@ -125,40 +126,45 @@ private void refresh() {
125126
automation.addChangedHandler(changedHandler);
126127
automation.setColSpan(4);
127128
automation.setWidth(400);
128-
automation.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
129+
AdvancedCriteria folderCriteria = new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA);
130+
automation.setVisibleWhen(folderCriteria);
129131

130132
SelectItem type = ItemFactory.newSelectItem(TYPE);
131133
type.setOptionDataSource(new SamplerTypeDS());
132134
type.setValueField(VALUE);
133-
type.setDisplayField(VALUE);
135+
type.setDisplayField("label");
134136
type.setValue(sampler.getType());
135137
type.addChangedHandler(changedHandler);
136138
type.addChangedHandler(changed -> chainStack.setVisible(CHAIN.equals(type.getValueAsString())));
137139
type.setRequired(true);
138140
type.setDisabled(sampler.getId() != 0L);
139141
type.setVisible(sampler.getId() == 0L);
140142

141-
StaticTextItem typeValue = ItemFactory.newStaticTextItem("typeValue", TYPE, sampler.getType());
143+
StaticTextItem typeValue = ItemFactory.newStaticTextItem("typeValue", TYPE,
144+
I18N.message("aisamplertype." + sampler.getType()));
142145
typeValue.setVisible(sampler.getId() != 0L);
143146

144147
StaticTextItem id = ItemFactory.newStaticTextItem(ID, Long.toString(sampler.getId()));
145148
id.setVisible(sampler.getId() != 0L);
146149

147150
folderSelector.setFolder(sampler.getFolder());
148151
folderSelector.addFolderChangeListener(folder -> changedHandler.onChanged(null));
149-
folderSelector.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
152+
folderSelector.setVisibleWhen(folderCriteria);
153+
documentSelector.setRequiredWhen(folderCriteria);
150154

151155
documentSelector.setDocument(sampler.getDocument());
152156
documentSelector.addDocumentChangeListener(document -> changedHandler.onChanged(null));
153-
documentSelector
154-
.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.NOT_IN_SET, new String[] { METADATA, CHAIN }));
157+
AdvancedCriteria documentCriteria = new AdvancedCriteria(TYPE, OperatorId.NOT_IN_SET,
158+
new String[] { METADATA, CHAIN });
159+
documentSelector.setVisibleWhen(documentCriteria);
160+
documentSelector.setRequiredWhen(documentCriteria);
155161

156162
TextItem category = ItemFactory.newTextItem("category", sampler.getCategory());
157163
category.addChangedHandler(changedHandler);
158164
category.setHint(I18N.message("extattrname"));
159165
category.setShowHintInField(true);
160166
category.setIconVAlign(VerticalAlignment.CENTER);
161-
category.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
167+
category.setVisibleWhen(folderCriteria);
162168
FormItemIcon takeAttributeForCategory = prepareTakeAttributeForCategory();
163169
category.setIcons(takeAttributeForCategory);
164170

@@ -169,7 +175,7 @@ private void refresh() {
169175
features.setHint(I18N.message("extattrnamesseparated"));
170176
features.setShowHintInField(true);
171177
features.setIconVAlign(VerticalAlignment.CENTER);
172-
features.setVisibleWhen(new AdvancedCriteria(TYPE, OperatorId.EQUALS, METADATA));
178+
features.setVisibleWhen(folderCriteria);
173179
features.setIcons(prepareTakeAttributeForFeatures(category));
174180

175181
form.setItems(id, typeValue, type, name, label, delimiter, quote, folderSelector, documentSelector, category,

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplerTypeDS.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ private void init(String url) {
2323
value.setPrimaryKey(true);
2424
value.setRequired(true);
2525

26-
setFields(value);
26+
DataSourceTextField label = new DataSourceTextField("label");
27+
28+
setFields(value, label);
2729
setClientOnly(true);
2830

2931
setDataURL(url);

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/ai/sampler/SamplersPanel.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ public void onDraw() {
8282
description.setCanSort(false);
8383

8484
ListGridField samplerType = new ListGridField("type", I18N.message("type"));
85+
samplerType.setCellFormatter((value, record, rowNum, colNum) -> I18N.message("aisamplertype." + value));
8586
samplerType.setAutoFit(AutoFitWidthApproach.BOTH);
8687

8788
list = new RefreshableListGrid();
@@ -139,8 +140,8 @@ public void onSuccess(GUISampler sampler) {
139140
});
140141
});
141142

142-
list.addDataArrivedHandler(event -> infoPanel
143-
.setMessage(I18N.message("showsamplers", Integer.toString(list.getTotalRows()))));
143+
list.addDataArrivedHandler(
144+
event -> infoPanel.setMessage(I18N.message("showsamplers", Integer.toString(list.getTotalRows()))));
144145

145146
detailsContainer.setAlign(Alignment.CENTER);
146147
detailsContainer.addMember(details);
@@ -176,11 +177,12 @@ public void onSuccess(Void result) {
176177
}
177178

178179
protected void showSamplerDetails(GUISampler sampler) {
179-
if (!(details instanceof SamplerDetailsPanel)) {
180-
detailsContainer.removeMember(details);
180+
detailsContainer.removeMember(details);
181+
if (sampler != null)
181182
details = new SamplerDetailsPanel(this);
182-
detailsContainer.addMember(details);
183-
}
183+
else
184+
details = SELECT_SAMPLER;
185+
detailsContainer.addMember(details);
184186
((SamplerDetailsPanel) details).setSampler(sampler);
185187
}
186188

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/metadata/RetentionPolicyDetailsPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void onSuccess(GUIRetentionPolicy policy) {
9090
form.setNumCols(2);
9191
form.setTitleOrientation(TitleOrientation.TOP);
9292

93-
TextItem name = ItemFactory.newSimpleTextItem("name", policy.getName());
93+
TextItem name = ItemFactory.newSimpleTextItemWithHyphen ("name", policy.getName());
9494
name.addChangedHandler(changedHandler);
9595
name.setWidth(200);
9696
name.setRequired(true);

‎logicaldoc-i18n/src/main/resources/i18n/messages.properties‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2726,4 +2726,11 @@ graph = Graph
27262726
stats = Stats
27272727
totalqueries = Total queries
27282728
currentmonthqueries = Current month queries
2729-
aistats = AI Stats
2729+
aistats = AI Stats
2730+
aimodeltype.neural = Neural Network
2731+
aimodeltype.tokens = Tokens Detector
2732+
aimodeltype.classifier = Classifier
2733+
aisamplertype.csv = CSV
2734+
aisamplertype.metadata = Metadata
2735+
aisamplertype.chain = Chain
2736+
aisamplertype.paragraph = Paragraph

0 commit comments

Comments
 (0)