vodorod/parcer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #530 from getmaxun/retrain-robot

Browse Source 
feat: retrain robot
This commit is contained in:
Karishma Shukla
2025-04-22 00:52:19 +05:30
committed by GitHub
parent 0f472ca2ae fca4db4ba1
commit b592951b5e
11 changed files with 228 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/locales/de.json
View File

@@ -54,6 +54,7 @@
"label": "URL",
"button": "Aufnahme starten"
},
"retrain": "Neu trainieren",
"edit": "Bearbeiten",
"delete": "Löschen",
"duplicate": "Duplizieren",
@@ -237,7 +238,9 @@
"confirm": "Bestätigen"
},
"notifications": {
"save_success": "Roboter erfolgreich gespeichert"
"save_success": "Roboter erfolgreich gespeichert",
"retrain_success": "Roboter erfolgreich neu trainiert",
"save_error": "Fehler beim Speichern des Roboters"
},
"errors": {
"user_not_logged": "Benutzer nicht angemeldet. Aufnahme kann nicht gespeichert werden.",

5
public/locales/en.json
View File

@@ -60,6 +60,7 @@
"discard_and_create":"Discard & Create New",
"cancel":"Cancel"
},
"retrain": "Retrain",
"edit":"Edit",
"delete":"Delete",
"duplicate":"Duplicate",
@@ -245,7 +246,9 @@
"confirm": "Confirm"
},
"notifications": {
"save_success": "Robot saved successfully"
"save_success": "Robot saved successfully",
"retrain_success": "Robot retrained successfully",
"save_error": "Error saving robot"
},
"errors": {
"user_not_logged": "User not logged in. Cannot save recording.",

5
public/locales/es.json
View File

@@ -54,6 +54,7 @@
"label": "URL",
"button": "Comenzar grabación"
},
"retrain": "Reentrenar",
"edit": "Editar",
"delete": "Eliminar",
"duplicate": "Duplicar",
@@ -238,7 +239,9 @@
"confirm": "Confirmar"
},
"notifications": {
"save_success": "Robot guardado exitosamente"
"save_success": "Robot guardado correctamente",
"retrain_success": "Robot reentrenado correctamente",
"save_error": "Error al guardar el robot"
},
"errors": {
"user_not_logged": "Usuario no conectado. No se puede guardar la grabación.",

5
public/locales/ja.json
View File

@@ -54,6 +54,7 @@
"label": "URL",
"button": "録画を開始"
},
"retrain": "再学習",
"edit": "編集",
"delete": "削除",
"duplicate": "複製",
@@ -238,7 +239,9 @@
"confirm": "確認"
},
"notifications": {
"save_success": "ロボットが正常に保存されました"
"save_success": "ロボットの保存に成功しました",
"retrain_success": "ロボットの再トレーニングに成功しました",
"save_error": "ロボットの保存中にエラーが発生しました"
},
"errors": {
"user_not_logged": "ユーザーがログインしていません。録画を保存できません。",

5
public/locales/zh.json
View File

@@ -54,6 +54,7 @@
"label": "URL",
"button": "开始录制"
},
"retrain": "重新训练",
"edit": "编辑",
"delete": "删除",
"duplicate": "复制",
@@ -238,7 +239,9 @@
"confirm": "确认"
},
"notifications": {
"save_success": "机器人保存成功"
"save_success": "机器人保存成功",
"retrain_success": "机器人重新训练成功",
"save_error": "保存机器人时出错"
},
"errors": {
"user_not_logged": "用户未登录。无法保存录制。",

82
server/src/workflow-management/classes/Generator.ts
View File

@@ -139,12 +139,14 @@ export class WorkflowGenerator {
*/
private registerEventHandlers = (socket: Socket) => {
socket.on('save', (data) => {
const { fileName, userId, isLogin } = data;
const { fileName, userId, isLogin, robotId } = data;
logger.log('debug', `Saving workflow ${fileName} for user ID ${userId}`);
this.saveNewWorkflow(fileName, userId, isLogin);
this.saveNewWorkflow(fileName, userId, isLogin, robotId);
});
socket.on('new-recording', () => this.workflowRecord = {
workflow: [],
socket.on('new-recording', (data) => {
this.workflowRecord = {
workflow: [],
};
});
socket.on('activeIndex', (data) => this.generatedData.lastIndex = parseInt(data));
socket.on('decision', async ({ pair, actionType, decision, userId }) => {
@@ -764,38 +766,62 @@ export class WorkflowGenerator {
* @param fileName The name of the file.
* @returns {Promise<void>}
*/
public saveNewWorkflow = async (fileName: string, userId: number, isLogin: boolean) => {
public saveNewWorkflow = async (fileName: string, userId: number, isLogin: boolean, robotId?: string) => {
const recording = this.optimizeWorkflow(this.workflowRecord);
let actionType = 'saved';
try {
this.recordingMeta = {
name: fileName,
id: uuid(),
createdAt: this.recordingMeta.createdAt || new Date().toLocaleString(),
pairs: recording.workflow.length,
updatedAt: new Date().toLocaleString(),
params: this.getParams() || [],
isLogin: isLogin,
}
const robot = await Robot.create({
userId,
recording_meta: this.recordingMeta,
recording: recording,
});
capture(
'maxun-oss-robot-created',
{
robot_meta: robot.recording_meta,
recording: robot.recording,
}
)
if (robotId) {
const robot = await Robot.findOne({ where: { 'recording_meta.id': robotId }});
logger.log('info', `Robot saved with id: ${robot.id}`);
if (robot) {
await robot.update({
recording: recording,
recording_meta: {
...robot.recording_meta,
pairs: recording.workflow.length,
params: this.getParams() || [],
updatedAt: new Date().toLocaleString(),
},
})
actionType = 'retrained';
logger.log('info', `Robot retrained with id: ${robot.id}`);
}
} else {
this.recordingMeta = {
name: fileName,
id: uuid(),
createdAt: this.recordingMeta.createdAt || new Date().toLocaleString(),
pairs: recording.workflow.length,
updatedAt: new Date().toLocaleString(),
params: this.getParams() || [],
isLogin: isLogin,
}
const robot = await Robot.create({
userId,
recording_meta: this.recordingMeta,
recording: recording,
});
capture(
'maxun-oss-robot-created',
{
robot_meta: robot.recording_meta,
recording: robot.recording,
}
)
actionType = 'saved';
logger.log('info', `Robot saved with id: ${robot.id}`);
}
}
catch (e) {
const { message } = e as Error;
logger.log('warn', `Cannot save the file to the local file system ${e}`)
actionType = 'error';
}
this.socket.emit('fileSaved');
this.socket.emit('fileSaved', { actionType });
}
/**

5
src/components/browser/BrowserRecordingSave.tsx
View File

@@ -55,6 +55,11 @@ const BrowserRecordingSave = () => {
type: 'recording-notification',
notification: notificationData
}, '*');
window.opener.postMessage({
type: 'session-data-clear',
timestamp: Date.now()
}, '*');
}
setBrowserId(null);

59
src/components/recorder/SaveRecording.tsx
View File

@@ -19,26 +19,32 @@ export const SaveRecording = ({ fileName }: SaveRecordingProps) => {
const { t } = useTranslation();
const [openModal, setOpenModal] = useState<boolean>(false);
const [needConfirm, setNeedConfirm] = useState<boolean>(false);
const [recordingName, setRecordingName] = useState<string>(fileName);
const [saveRecordingName, setSaveRecordingName] = useState<string>(fileName);
const [waitingForSave, setWaitingForSave] = useState<boolean>(false);
const { browserId, setBrowserId, notify, recordings, isLogin } = useGlobalInfoStore();
const { browserId, setBrowserId, notify, recordings, isLogin, recordingName, retrainRobotId } = useGlobalInfoStore();
const { socket } = useSocketStore();
const { state, dispatch } = useContext(AuthContext);
const { user } = state;
const navigate = useNavigate();
useEffect(() => {
if (recordingName) {
setSaveRecordingName(recordingName);
}
}, [recordingName]);
const handleChangeOfTitle = (event: React.ChangeEvent<HTMLInputElement>) => {
const { value } = event.target;
if (needConfirm) {
setNeedConfirm(false);
}
setRecordingName(value);
setSaveRecordingName(value);
}
const handleSaveRecording = async (event: React.SyntheticEvent) => {
event.preventDefault();
if (recordings.includes(recordingName)) {
if (recordings.includes(saveRecordingName)) {
if (needConfirm) { return; }
setNeedConfirm(true);
} else {
@@ -46,19 +52,43 @@ export const SaveRecording = ({ fileName }: SaveRecordingProps) => {
}
};
const exitRecording = useCallback(async () => {
const handleFinishClick = () => {
if (recordingName && !recordings.includes(recordingName)) {
saveRecording();
} else {
setOpenModal(true);
}
};
const exitRecording = useCallback(async (data?: { actionType: string }) => {
let successMessage = t('save_recording.notifications.save_success');
if (data && data.actionType) {
if (data.actionType === 'retrained') {
successMessage = t('save_recording.notifications.retrain_success');
} else if (data.actionType === 'saved') {
successMessage = t('save_recording.notifications.save_success');
} else if (data.actionType === 'error') {
successMessage = t('save_recording.notifications.save_error');
}
}
const notificationData = {
type: 'success',
message: t('save_recording.notifications.save_success'),
message: successMessage,
timestamp: Date.now()
};
window.sessionStorage.setItem('pendingNotification', JSON.stringify(notificationData));
if (window.opener) {
window.opener.postMessage({
type: 'recording-notification',
notification: notificationData
}, '*');
window.opener.postMessage({
type: 'session-data-clear',
timestamp: Date.now()
}, '*');
}
if (browserId) {
@@ -67,16 +97,21 @@ export const SaveRecording = ({ fileName }: SaveRecordingProps) => {
setBrowserId(null);
window.close();
}, [setBrowserId, browserId]);
}, [setBrowserId, browserId, t]);
// notifies backed to save the recording in progress,
// releases resources and changes the view for main page by clearing the global browserId
const saveRecording = async () => {
if (user) {
const payload = { fileName: recordingName, userId: user.id, isLogin: isLogin };
const payload = {
fileName: saveRecordingName || recordingName,
userId: user.id,
isLogin: isLogin,
robotId: retrainRobotId,
};
socket?.emit('save', payload);
setWaitingForSave(true);
console.log(`Saving the recording as ${recordingName} for userId ${user.id}`);
console.log(`Saving the recording as ${saveRecordingName || recordingName} for userId ${user.id}`);
} else {
console.error(t('save_recording.notifications.user_not_logged'));
}
@@ -92,7 +127,7 @@ export const SaveRecording = ({ fileName }: SaveRecordingProps) => {
return (
<div>
<Button
onClick={() => setOpenModal(true)}
onClick={handleFinishClick}
variant="outlined"
color="success"
sx={{
@@ -116,7 +151,7 @@ export const SaveRecording = ({ fileName }: SaveRecordingProps) => {
id="title"
label={t('save_recording.robot_name')}
variant="outlined"
defaultValue={recordingName ? recordingName : null}
value={saveRecordingName}
/>
{needConfirm
?

84
src/components/robot/RecordingsTable.tsx
View File

@@ -35,7 +35,8 @@ import {
Settings,
Power,
ContentCopy,
MoreHoriz
MoreHoriz,
Refresh
} from "@mui/icons-material";
import { useGlobalInfoStore } from "../../context/globalInfo";
import { checkRunsForRecording, deleteRecordingFromStorage, getStoredRecordings } from "../../api/storage";
@@ -117,6 +118,7 @@ const TableRowMemoized = memo(({ row, columns, handlers }: any) => {
return (
<MemoizedTableCell key={column.id} align={column.align}>
<MemoizedOptionsButton
handleRetrain={() =>handlers.handleRetrainRobot(row.id, row.name)}
handleEdit={() => handlers.handleEditRobot(row.id, row.name, row.params || [])}
handleDuplicate={() => handlers.handleDuplicateRobot(row.id, row.name, row.params || [])}
handleDelete={() => handlers.handleDelete(row.id)}
@@ -185,7 +187,7 @@ export const RecordingsTable = ({
useEffect(() => {
const handleMessage = (event: any) => {
if (event.data && event.data.type === 'recording-notification') {
if (event.origin === window.location.origin && event.data && event.data.type === 'recording-notification') {
const notificationData = event.data.notification;
if (notificationData) {
notify(notificationData.type, notificationData.message);
@@ -198,6 +200,17 @@ export const RecordingsTable = ({
}
}
}
if (event.origin === window.location.origin && event.data && event.data.type === 'session-data-clear') {
window.sessionStorage.removeItem('browserId');
window.sessionStorage.removeItem('robotToRetrain');
window.sessionStorage.removeItem('robotName');
window.sessionStorage.removeItem('recordingUrl');
window.sessionStorage.removeItem('recordingSessionId');
window.sessionStorage.removeItem('pendingSessionData');
window.sessionStorage.removeItem('nextTabIsRecording');
window.sessionStorage.removeItem('initialUrl');
}
};
window.addEventListener('message', handleMessage);
@@ -303,6 +316,60 @@ export const RecordingsTable = ({
setModalOpen(true);
};
const handleRetrainRobot = useCallback(async (id: string, name: string) => {
const activeBrowserId = await getActiveBrowserId();
const robot = rows.find(row => row.id === id);
let targetUrl;
if (robot?.content?.workflow && robot.content.workflow.length > 0) {
const lastPair = robot.content.workflow[robot.content.workflow.length - 1];
if (lastPair?.what) {
if (Array.isArray(lastPair.what)) {
const gotoAction = lastPair.what.find(action =>
action && typeof action === 'object' && 'action' in action && action.action === "goto"
) as any;
if (gotoAction?.args?.[0]) {
targetUrl = gotoAction.args[0];
}
}
}
}
if (targetUrl) {
setInitialUrl(targetUrl);
setRecordingUrl(targetUrl);
window.sessionStorage.setItem('initialUrl', targetUrl);
}
if (activeBrowserId) {
setActiveBrowserId(activeBrowserId);
setWarningModalOpen(true);
} else {
startRetrainRecording(id, name, targetUrl);
}
}, [rows, setInitialUrl, setRecordingUrl]);
const startRetrainRecording = (id: string, name: string, url?: string) => {
setBrowserId('new-recording');
setRecordingName(name);
setRecordingId(id);
window.sessionStorage.setItem('browserId', 'new-recording');
window.sessionStorage.setItem('robotToRetrain', id);
window.sessionStorage.setItem('robotName', name);
window.sessionStorage.setItem('recordingUrl', url || recordingUrl);
const sessionId = Date.now().toString();
window.sessionStorage.setItem('recordingSessionId', sessionId);
window.openedRecordingWindow = window.open(`/recording-setup?session=${sessionId}`, '_blank');
window.sessionStorage.setItem('nextTabIsRecording', 'true');
};
const startRecording = () => {
setModalOpen(false);
@@ -381,6 +448,7 @@ export const RecordingsTable = ({
handleSettingsRecording,
handleEditRobot,
handleDuplicateRobot,
handleRetrainRobot,
handleDelete: async (id: string) => {
const hasRuns = await checkRunsForRecording(id);
if (hasRuns) {
@@ -395,7 +463,7 @@ export const RecordingsTable = ({
fetchRecordings();
}
}
}), [handleRunRecording, handleScheduleRecording, handleIntegrateRecording, handleSettingsRecording, handleEditRobot, handleDuplicateRobot, notify, t]);
}), [handleRunRecording, handleScheduleRecording, handleIntegrateRecording, handleSettingsRecording, handleEditRobot, handleDuplicateRobot, handleRetrainRobot, notify, t]);
return (
<React.Fragment>
@@ -597,12 +665,13 @@ const SettingsButton = ({ handleSettings }: SettingsButtonProps) => {
}
interface OptionsButtonProps {
handleRetrain: () => void;
handleEdit: () => void;
handleDelete: () => void;
handleDuplicate: () => void;
}
const OptionsButton = ({ handleEdit, handleDelete, handleDuplicate }: OptionsButtonProps) => {
const OptionsButton = ({ handleRetrain, handleEdit, handleDelete, handleDuplicate }: OptionsButtonProps) => {
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
const handleClick = (event: React.MouseEvent<HTMLElement>) => {
@@ -629,6 +698,13 @@ const OptionsButton = ({ handleEdit, handleDelete, handleDuplicate }: OptionsBut
open={Boolean(anchorEl)}
onClose={handleClose}
>
<MenuItem onClick={() => { handleRetrain(); handleClose(); }}>
<ListItemIcon>
<Refresh fontSize="small" />
</ListItemIcon>
<ListItemText>{t('recordingtable.retrain')}</ListItemText>
</MenuItem>
<MenuItem onClick={() => { handleEdit(); handleClose(); }}>
<ListItemIcon>
<Edit fontSize="small" />

6
src/context/globalInfo.tsx
View File

@@ -60,6 +60,8 @@ interface GlobalInfo {
setRecordingLength: (recordingLength: number) => void;
recordingId: string | null;
setRecordingId: (newId: string | null) => void;
retrainRobotId: string | null;
setRetrainRobotId: (newId: string | null) => void;
recordingName: string;
setRecordingName: (recordingName: string) => void;
initialUrl: string;
@@ -90,6 +92,7 @@ class GlobalInfoStore implements Partial<GlobalInfo> {
isOpen: false,
};
recordingId = null;
retrainRobotId = null;
recordings: string[] = [];
rerenderRuns = false;
rerenderRobots = false;
@@ -119,6 +122,7 @@ export const GlobalInfoProvider = ({ children }: { children: JSX.Element }) => {
const [rerenderRobots, setRerenderRobots] = useState<boolean>(globalInfoStore.rerenderRobots);
const [recordingLength, setRecordingLength] = useState<number>(globalInfoStore.recordingLength);
const [recordingId, setRecordingId] = useState<string | null>(globalInfoStore.recordingId);
const [retrainRobotId, setRetrainRobotId] = useState<string | null>(globalInfoStore.retrainRobotId);
const [recordingName, setRecordingName] = useState<string>(globalInfoStore.recordingName);
const [isLogin, setIsLogin] = useState<boolean>(globalInfoStore.isLogin);
const [initialUrl, setInitialUrl] = useState<string>(globalInfoStore.initialUrl);
@@ -169,6 +173,8 @@ export const GlobalInfoProvider = ({ children }: { children: JSX.Element }) => {
setRecordingLength,
recordingId,
setRecordingId,
retrainRobotId,
setRetrainRobotId,
recordingName,
setRecordingName,
initialUrl,

19
src/pages/RecordingPage.tsx
View File

@@ -43,7 +43,7 @@ export const RecordingPage = ({ recordingName }: RecordingPageProps) => {
const { setId, socket } = useSocketStore();
const { setWidth } = useBrowserDimensionsStore();
const { browserId, setBrowserId, recordingId, recordingUrl, setRecordingUrl } = useGlobalInfoStore();
const { browserId, setBrowserId, recordingId, recordingUrl, setRecordingUrl, setRecordingName, setRetrainRobotId } = useGlobalInfoStore();
const handleShowOutputData = useCallback(() => {
setShowOutputData(true);
@@ -80,6 +80,19 @@ export const RecordingPage = ({ recordingName }: RecordingPageProps) => {
const storedUrl = window.sessionStorage.getItem('recordingUrl');
if (storedUrl && !recordingUrl) {
setRecordingUrl(storedUrl);
window.sessionStorage.removeItem('recordingUrl');
}
const robotName = window.sessionStorage.getItem('robotName');
if (robotName) {
setRecordingName(robotName);
window.sessionStorage.removeItem('robotName');
}
const recordingId = window.sessionStorage.getItem('robotToRetrain');
if (recordingId) {
setRetrainRobotId(recordingId);
window.sessionStorage.removeItem('robotToRetrain');
}
const id = await getActiveBrowserId();
@@ -101,7 +114,7 @@ export const RecordingPage = ({ recordingName }: RecordingPageProps) => {
return () => {
isCancelled = true;
}
}, [setId, recordingUrl, setRecordingUrl]);
}, [setId, recordingUrl, setRecordingUrl, setRecordingName, setRetrainRobotId]);
const changeBrowserDimensions = useCallback(() => {
if (browserContentRef.current) {
@@ -126,7 +139,7 @@ export const RecordingPage = ({ recordingName }: RecordingPageProps) => {
}
setIsLoaded(true);
}
}, [socket, browserId, recordingName, recordingId, isLoaded])
}, [socket, browserId, recordingName, recordingId, isLoaded]);
useEffect(() => {
socket?.on('loaded', handleLoaded);