Skip to content

Commit eded5d5

Browse files
car031car031
committed
AI model import/export
1 parent 43773fe commit eded5d5

File tree

8 files changed

+178
-24
lines changed

8 files changed

+178
-24
lines changed

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/common/client/preview/MailPreviewPanel.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ public MailPreviewPanel(GUIEmail mail, GUIDocument document, int width) {
8686
html.setWidth100();
8787
html.setHeight100();
8888
html.setContents("<iframe id='htmlmailpreview-" + getID()
89-
+ "' style='border:0px solid white; width:100%; height:100%;'></iframe>");
89+
+ "' style='border:0px solid white; width:100%; height:100%;' srcdoc='" + mail.getMessage()
90+
+ "'></iframe>");
9091
body = html;
9192
} else {
9293
if (document.getFileName().toLowerCase().endsWith(".msg") && mail.getMessage().contains("\\rtf1")) {
@@ -274,7 +275,7 @@ public void onSuccess(GUIDocument doc) {
274275

275276
return contextMenu;
276277
}
277-
278+
278279
@Override
279280
public boolean equals(Object obj) {
280281
return super.equals(obj);

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,17 @@ public interface AIService extends RemoteService {
122122
*/
123123
public List<GUIQueryResult> query(long modelId, List<String> features) throws ServerException;
124124

125+
/**
126+
* Imports a new model
127+
*
128+
* @param modelName Name to give to the new imported model
129+
*
130+
* @return The created model
131+
*
132+
* @throws ServerException an error happened in the server application
133+
*/
134+
public GUIModel importModel(String modelName) throws ServerException;
135+
125136
public static class Instance {
126137
private static AIServiceAsync inst;
127138

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,6 @@ public interface AIServiceAsync {
2828
void evaluateModel(long modelId, AsyncCallback<Void> callback);
2929

3030
void query(long modelId, List<String> features, AsyncCallback<List<GUIQueryResult>> callback);
31+
32+
void importModel(String modelName, AsyncCallback<GUIModel> callback);
3133
}

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

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
package com.logicaldoc.gui.frontend.client.ai.model;
2+
3+
import com.logicaldoc.gui.common.client.DefaultAsyncCallback;
4+
import com.logicaldoc.gui.common.client.IgnoreAsyncCallback;
5+
import com.logicaldoc.gui.common.client.i18n.I18N;
6+
import com.logicaldoc.gui.common.client.util.ItemFactory;
7+
import com.logicaldoc.gui.common.client.util.LD;
8+
import com.logicaldoc.gui.common.client.widgets.Upload;
9+
import com.logicaldoc.gui.frontend.client.ai.AIService;
10+
import com.logicaldoc.gui.frontend.client.services.DocumentService;
11+
import com.smartgwt.client.types.HeaderControls;
12+
import com.smartgwt.client.util.SC;
13+
import com.smartgwt.client.widgets.IButton;
14+
import com.smartgwt.client.widgets.Window;
15+
import com.smartgwt.client.widgets.form.DynamicForm;
16+
import com.smartgwt.client.widgets.form.fields.TextItem;
17+
import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
18+
import com.smartgwt.client.widgets.layout.HLayout;
19+
import com.smartgwt.client.widgets.layout.VLayout;
20+
21+
/**
22+
* This popup window is used to upload a new AI model.
23+
*
24+
* @author Marco Meschieri - LogicalDOC
25+
* @since 9.2
26+
*/
27+
public class ModelImporter extends Window {
28+
private IButton save;
29+
30+
private Upload uploader;
31+
32+
DynamicForm form = new DynamicForm();
33+
34+
private ChangedHandler changedHandler;
35+
36+
public ModelImporter(ChangedHandler changedHandler) {
37+
setHeaderControls(HeaderControls.HEADER_LABEL, HeaderControls.CLOSE_BUTTON);
38+
setTitle(I18N.message("uploadmodel"));
39+
setWidth(430);
40+
setHeight(200);
41+
setCanDragResize(true);
42+
setIsModal(true);
43+
setShowModalMask(true);
44+
centerInPage();
45+
46+
this.changedHandler = changedHandler;
47+
48+
save = new IButton(I18N.message("import"));
49+
save.addClickHandler(click -> onUpload());
50+
51+
TextItem name = ItemFactory.newSimpleTextItem("name", "name", "newmodel");
52+
name.setRequired(true);
53+
54+
form.setItems(name);
55+
56+
uploader = new Upload(save);
57+
58+
HLayout buttons = new HLayout();
59+
buttons.setMembersMargin(2);
60+
buttons.setMembers(save);
61+
62+
VLayout layout = new VLayout();
63+
layout.setMembersMargin(5);
64+
layout.setMargin(2);
65+
layout.addMember(form);
66+
layout.addMember(uploader);
67+
layout.addMember(buttons);
68+
addItem(layout);
69+
70+
addCloseClickHandler(click -> cleanUploads());
71+
}
72+
73+
private void cleanUploads() {
74+
DocumentService.Instance.get().cleanUploadedFileFolder(new IgnoreAsyncCallback<>());
75+
}
76+
77+
private void onUpload() {
78+
if (!form.validate())
79+
return;
80+
81+
if (uploader.getUploadedFile() == null) {
82+
SC.warn(I18N.message("filerequired"));
83+
return;
84+
}
85+
86+
LD.contactingServer();
87+
save.setDisabled(true);
88+
AIService.Instance.get().importModel(form.getValueAsString("name"), new DefaultAsyncCallback<>() {
89+
90+
@Override
91+
public void onFailure(Throwable caught) {
92+
super.onFailure(caught);
93+
save.setDisabled(false);
94+
cleanUploads();
95+
}
96+
97+
@Override
98+
public void onSuccess(GUIModel model) {
99+
super.onSuccess(model);
100+
save.setDisabled(false);
101+
if (changedHandler != null)
102+
changedHandler.onChanged(null);
103+
cleanUploads();
104+
destroy();
105+
}
106+
107+
});
108+
}
109+
110+
@Override
111+
public boolean equals(Object other) {
112+
return super.equals(other);
113+
}
114+
115+
@Override
116+
public int hashCode() {
117+
return super.hashCode();
118+
}
119+
}

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

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.logicaldoc.gui.common.client.i18n.I18N;
1414
import com.logicaldoc.gui.common.client.log.GuiLog;
1515
import com.logicaldoc.gui.common.client.util.LD;
16+
import com.logicaldoc.gui.common.client.util.Util;
1617
import com.logicaldoc.gui.common.client.widgets.HTMLPanel;
1718
import com.logicaldoc.gui.common.client.widgets.InfoPanel;
1819
import com.logicaldoc.gui.frontend.client.ai.AIService;
@@ -137,26 +138,28 @@ public void onDraw() {
137138

138139
ToolStripButton refresh = new ToolStripButton();
139140
refresh.setTitle(I18N.message("refresh"));
140-
refresh.addClickHandler(event -> {
141-
list.refresh(new ModelDS());
142-
detailsContainer.removeMembers(detailsContainer.getMembers());
143-
details = SELECT_MODEL;
144-
detailsContainer.setMembers(details);
145-
});
141+
refresh.addClickHandler(click -> refresh());
146142
toolStrip.addButton(refresh);
147143

148144
ToolStripButton add = new ToolStripButton();
149145
add.setTitle(I18N.message("addmodel"));
150146
toolStrip.addButton(add);
151147
add.addClickHandler(event -> onAddModel());
152-
148+
153149
toolStrip.addSeparator();
154150

155151
ToolStripButton settings = new ToolStripButton();
156152
settings.setTitle(I18N.message("settings"));
157153
toolStrip.addButton(settings);
158154
settings.addClickHandler(event -> new AISettings().show());
159-
155+
156+
toolStrip.addSeparator();
157+
158+
ToolStripButton importModel = new ToolStripButton();
159+
importModel.setTitle(I18N.message("import"));
160+
toolStrip.addButton(importModel);
161+
importModel.addClickHandler(event -> new ModelImporter(changed -> refresh()).show());
162+
160163
toolStrip.addFill();
161164

162165
list.addCellContextClickHandler(event -> {
@@ -194,6 +197,13 @@ public void run() {
194197
timer.scheduleRepeating(5 * 1000);
195198
}
196199

200+
private void refresh() {
201+
list.refresh(new ModelDS());
202+
detailsContainer.removeMembers(detailsContainer.getMembers());
203+
details = SELECT_MODEL;
204+
detailsContainer.setMembers(details);
205+
}
206+
197207
private void showContextMenu() {
198208
Menu contextMenu = new Menu();
199209

@@ -202,6 +212,8 @@ private void showContextMenu() {
202212
for (ListGridRecord rec : selection)
203213
ids.add(rec.getAttributeAsLong(ID));
204214

215+
Long selectedModelId = selection[0].getAttributeAsLong("id");
216+
205217
MenuItem delete = new MenuItem();
206218
delete.setTitle(I18N.message("ddelete"));
207219
delete.addClickHandler(event -> LD.ask(I18N.message("question"), I18N.message("confirmdelete"), confirm -> {
@@ -251,17 +263,25 @@ public void onSuccess(Void result) {
251263

252264
MenuItem query = new MenuItem();
253265
query.setTitle(I18N.message("querymodel"));
254-
query.addClickHandler(event -> AIService.Instance.get().getModel(selection[0].getAttributeAsLong("id"),
255-
new DefaultAsyncCallback<>() {
256-
@Override
257-
public void onSuccess(GUIModel mdl) {
258-
new QueryDialog(mdl).show();
259-
}
260-
}));
266+
query.addClickHandler(event -> {
267+
AIService.Instance.get().getModel(selectedModelId, new DefaultAsyncCallback<>() {
268+
@Override
269+
public void onSuccess(GUIModel mdl) {
270+
new QueryDialog(mdl).show();
271+
}
272+
});
273+
});
261274
query.setEnabled(!selection[0].getAttributeAsBoolean(TRAINING)
262275
&& !selection[0].getAttributeAsBoolean(EVALUATING) && selection[0].getAttribute(TRAINED) != null);
263276

264-
contextMenu.setItems(query, train, evaluate, delete);
277+
MenuItem export = new MenuItem();
278+
export.setTitle(I18N.message("export"));
279+
export.addClickHandler(
280+
click -> Util.download(Util.contextPath() + "ai/controller?command=export&modelId=" + selectedModelId));
281+
282+
com.smartgwt.client.widgets.menu.MenuItemSeparator sep = new com.smartgwt.client.widgets.menu.MenuItemSeparator();
283+
284+
contextMenu.setItems(query, train, evaluate, sep, export, sep, delete);
265285
contextMenu.showContextMenu();
266286
}
267287

‎logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/folder/FolderTile.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.smartgwt.client.widgets.IButton;
1111
import com.smartgwt.client.widgets.Img;
1212
import com.smartgwt.client.widgets.events.ClickEvent;
13-
import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
1413
import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
1514
import com.smartgwt.client.widgets.layout.HLayout;
1615
import com.smartgwt.client.widgets.layout.VLayout;
@@ -59,7 +58,7 @@ private void initGUI() {
5958
Img changeImage = new Img("[SKIN]/image.svg", 16, 16);
6059
changeImage.setShowRollOver(true);
6160
changeImage.setTooltip(I18N.message("changeimage"));
62-
changeImage.addClickHandler((ClickEvent evn) -> new FolderImageUploader(folder, (ChangedEvent ev) -> {
61+
changeImage.addClickHandler(click -> new FolderImageUploader(folder, ev -> {
6362
initGUI();
6463
changedHandler.onChanged(null);
6564
}).show());
@@ -75,14 +74,14 @@ private void initGUI() {
7574
setMembers(tileImage, icons);
7675
} else {
7776
IButton showThumbnail = new IButton(I18N.message("showtile"));
78-
showThumbnail.addClickHandler((ClickEvent event) -> {
77+
showThumbnail.addClickHandler(click -> {
7978
Session.get().setShowThumbnail(true);
8079
initGUI();
8180
});
8281
setMembers(showThumbnail);
8382
}
8483
}
85-
84+
8685
@Override
8786
public boolean equals(Object other) {
8887
return super.equals(other);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2697,4 +2697,6 @@ confirmevaluation = Do you want to start the evaluation ?
26972697
querymodel = Query the model
26982698
querymodel2 = Query the model {0}
26992699
noresults = No results
2700-
modelsstoragelocation = Location of trained models
2700+
modelsstoragelocation = Location of trained models
2701+
uploadmodel = Upload a Model
2702+
import = Import

‎logicaldoc-webapp/src/main/java/com/logicaldoc/web/service/FolderServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,7 +1200,7 @@ public void merge(List<Long> folderIds, long targetId) throws ServerException {
12001200
@Override
12011201
public String readImage() throws ServerException {
12021202
final Session session = validateSession();
1203-
List<String> allowedExts = Arrays.asList("png", "gif", "jpg", "jpeg", "webp", "jfif");
1203+
List<String> allowedExts = Arrays.asList("png", "gif", "jpg", "jpeg", "webp", "jfif", "svg");
12041204

12051205
Map<String, File> uploadedFilesMap = getUploadedFiles(session.getSid());
12061206
for (Map.Entry<String, File> entry : uploadedFilesMap.entrySet()) {

0 commit comments

Comments
 (0)