Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
lmp_server
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lmp
lmp_server
Commits
e45383a0
Commit
e45383a0
authored
Dec 13, 2023
by
linpeiqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化事物
parent
b18488c2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
28 deletions
+33
-28
ModelManageServiceImpl.java
...ice/webadmin/app/service/impl/ModelManageServiceImpl.java
+2
-2
TuningRunServiceImpl.java
.../yice/webadmin/app/service/impl/TuningRunServiceImpl.java
+31
-26
No files found.
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelManageServiceImpl.java
View file @
e45383a0
...
...
@@ -176,7 +176,7 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple
return
resultList
;
}
@Transactional
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
ModelManage
saveAndCreateVersion
(
ModelManage
modelManage
,
ModelVersion
modelVersion
)
{
ModelManage
reModelManage
=
this
.
saveNew
(
modelManage
);
...
...
@@ -187,7 +187,7 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple
this
.
modelVersionService
.
saveNew
(
modelVersion
);
return
reModelManage
;
}
@Transactional
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
ModelVersion
saveAndCreateVersionV
(
ModelManage
modelManage
,
ModelVersion
modelVersion
)
{
ModelManage
reModelManage
=
this
.
saveNew
(
modelManage
);
...
...
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/TuningRunServiceImpl.java
View file @
e45383a0
...
...
@@ -184,34 +184,36 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
TuningRun
tuningRun
=
this
.
getById
(
runPublishDto
.
getRunId
());
ModelVersion
modelVersionSource
=
this
.
modelVersionService
.
getById
(
tuningRun
.
getModelVersionId
());
ModelTask
modelTask
=
new
ModelTask
();
ModelVersion
modelVersionTarget
=
saveAll
(
tuningRun
,
runPublishDto
,
modelVersionSource
,
modelTask
);
messageWithSocket
(
tuningRun
,
modelVersionSource
,
pythonConfig
.
getModelOutputFileBaseDir
()
+
modelVersionTarget
.
getVersionName
(),
modelVersionTarget
,
modelTask
);
ModelVersion
modelVersionTarget
=
saveAll
(
tuningRun
,
runPublishDto
,
modelVersionSource
,
modelTask
);
messageWithSocket
(
tuningRun
,
modelVersionSource
,
pythonConfig
.
getModelOutputFileBaseDir
()
+
modelVersionTarget
.
getVersionName
(),
modelVersionTarget
,
modelTask
);
return
true
;
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ModelManage
createToModel
(
ModelManage
modelManage
,
ModelVersion
modelVersion
)
{
TuningRun
tuningRun
=
this
.
getById
(
modelVersion
.
getRunId
());
ModelVersion
modelVersionSource
=
this
.
modelVersionService
.
getById
(
tuningRun
.
getModelVersionId
());
ModelTask
modelTask
=
new
ModelTask
();
ModelVersion
modelVersionTarget
=
saveAll
(
tuningRun
,
modelManage
,
modelVersion
,
modelVersionSource
,
modelTask
);
messageWithSocket
(
tuningRun
,
modelVersionSource
,
pythonConfig
.
getModelOutputFileBaseDir
()
+
modelVersionTarget
.
getVersionName
(),
modelVersionTarget
,
modelTask
);
ModelVersion
modelVersionTarget
=
saveAll
(
tuningRun
,
modelManage
,
modelVersion
,
modelVersionSource
,
modelTask
);
messageWithSocket
(
tuningRun
,
modelVersionSource
,
pythonConfig
.
getModelOutputFileBaseDir
()
+
modelVersionTarget
.
getVersionName
(),
modelVersionTarget
,
modelTask
);
return
modelManage
;
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ModelVersion
createToModelVersion
(
ModelVersion
modelVersion
)
{
TuningRun
tuningRun
=
this
.
getById
(
modelVersion
.
getRunId
());
ModelVersion
modelVersionSource
=
this
.
modelVersionService
.
getById
(
tuningRun
.
getModelVersionId
());
ModelTask
modelTask
=
new
ModelTask
();
ModelVersion
modelVersionTarget
=
saveAll
(
tuningRun
,
modelVersion
,
modelVersionSource
,
modelTask
);
messageWithSocket
(
tuningRun
,
modelVersionSource
,
pythonConfig
.
getModelOutputFileBaseDir
()
+
modelVersionTarget
.
getVersionName
(),
modelVersionTarget
,
modelTask
);
ModelVersion
modelVersionTarget
=
saveAll
(
tuningRun
,
modelVersion
,
modelVersionSource
,
modelTask
);
messageWithSocket
(
tuningRun
,
modelVersionSource
,
pythonConfig
.
getModelOutputFileBaseDir
()
+
modelVersionTarget
.
getVersionName
(),
modelVersionTarget
,
modelTask
);
return
modelVersionTarget
;
}
@SneakyThrows
private
void
messageWithSocket
(
TuningRun
tuningRun
,
ModelVersion
modelVersionSource
,
String
targetModelVersionURl
,
ModelVersion
modelVersionTarget
,
ModelTask
modelTask
)
{
private
void
messageWithSocket
(
TuningRun
tuningRun
,
ModelVersion
modelVersionSource
,
String
targetModelVersionURl
,
ModelVersion
modelVersionTarget
,
ModelTask
modelTask
)
{
new
WebSocketClient
(
new
URI
(
this
.
pythonConfig
.
getPythonWebsocketUri
()))
{
@Override
public
void
onOpen
(
ServerHandshake
serverHandshake
)
{
...
...
@@ -254,7 +256,7 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
log
.
info
(
"发送服务端的消息:"
+
sendJson
.
toJSONString
());
if
(
receiveMsg
.
equals
(
"process_completed"
))
{
System
.
out
.
println
(
"isSuccess4:"
+
System
.
currentTimeMillis
());
updateStatus
(
receiveJson
.
getBoolean
(
"success"
),
tuningRun
,
modelVersionTarget
,
targetModelVersionURl
,
modelTask
);
updateStatus
(
receiveJson
.
getBoolean
(
"success"
),
tuningRun
,
modelVersionTarget
,
targetModelVersionURl
,
modelTask
);
}
}
...
...
@@ -269,48 +271,49 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
}
}.
connectBlocking
(
5000
,
TimeUnit
.
MILLISECONDS
);
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ModelVersion
saveAll
(
TuningRun
tuningRun
,
RunPublishDto
runPublishDto
,
ModelVersion
modelVersionSource
,
ModelTask
modelTask
)
{
public
ModelVersion
saveAll
(
TuningRun
tuningRun
,
RunPublishDto
runPublishDto
,
ModelVersion
modelVersionSource
,
ModelTask
modelTask
)
{
ModelVersion
modelVersion
=
new
ModelVersion
();
this
.
initModelVersion
(
modelVersion
,
tuningRun
,
modelVersionSource
);
ModelManage
modelManag
=
new
ModelManage
();
this
.
initModelVersion
(
modelVersion
,
tuningRun
,
modelVersionSource
);
ModelManage
modelManag
e
=
new
ModelManage
();
if
(
runPublishDto
.
getPublishWay
()
==
0
)
{
modelManag
.
setModelDescribe
(
runPublishDto
.
getModelDescribe
());
modelManag
.
setModelName
(
runPublishDto
.
getModelName
());
modelManag
.
setModelType
(
0
);
modelManag
.
setIsBaseModel
(
0
);
modelManageService
.
saveAndCreateVersionV
(
modelManag
,
modelVersion
);
modelManag
e
.
setModelDescribe
(
runPublishDto
.
getModelDescribe
());
modelManag
e
.
setModelName
(
runPublishDto
.
getModelName
());
modelManag
e
.
setModelType
(
0
);
modelManag
e
.
setIsBaseModel
(
0
);
modelManageService
.
saveAndCreateVersionV
(
modelManag
e
,
modelVersion
);
}
else
{
modelVersion
.
setModelId
(
runPublishDto
.
getModelId
());
modelVersionService
.
saveNew
(
modelVersion
);
}
this
.
initModelTask
(
modelTask
,
tuningRun
,
modelVersion
);
this
.
initModelTask
(
modelTask
,
tuningRun
,
modelVersion
);
this
.
modelTaskService
.
saveNew
(
modelTask
);
return
modelVersion
;
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ModelVersion
saveAll
(
TuningRun
tuningRun
,
ModelManage
modelManageS
,
ModelVersion
modelVersion
,
ModelVersion
modelVersionSource
,
ModelTask
modelTask
)
{
this
.
initModelVersion
(
modelVersion
,
tuningRun
,
modelVersionSource
);
public
ModelVersion
saveAll
(
TuningRun
tuningRun
,
ModelManage
modelManageS
,
ModelVersion
modelVersion
,
ModelVersion
modelVersionSource
,
ModelTask
modelTask
)
{
this
.
initModelVersion
(
modelVersion
,
tuningRun
,
modelVersionSource
);
modelManageS
.
setModelType
(
0
);
modelManageS
.
setIsBaseModel
(
0
);
modelManageService
.
saveAndCreateVersionV
(
modelManageS
,
modelVersion
);
this
.
initModelTask
(
modelTask
,
tuningRun
,
modelVersion
);
this
.
initModelTask
(
modelTask
,
tuningRun
,
modelVersion
);
this
.
modelTaskService
.
saveNew
(
modelTask
);
return
modelVersion
;
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ModelVersion
saveAll
(
TuningRun
tuningRun
,
ModelVersion
modelVersion
,
ModelVersion
modelVersionSource
,
ModelTask
modelTask
)
{
this
.
initModelVersion
(
modelVersion
,
tuningRun
,
modelVersionSource
);
public
ModelVersion
saveAll
(
TuningRun
tuningRun
,
ModelVersion
modelVersion
,
ModelVersion
modelVersionSource
,
ModelTask
modelTask
)
{
this
.
initModelVersion
(
modelVersion
,
tuningRun
,
modelVersionSource
);
modelVersionService
.
saveNew
(
modelVersion
);
modelTask
.
setModelVersion
(
modelVersion
.
getModelVersion
());
this
.
initModelTask
(
modelTask
,
tuningRun
,
modelVersion
);
this
.
initModelTask
(
modelTask
,
tuningRun
,
modelVersion
);
this
.
modelTaskService
.
saveNew
(
modelTask
);
return
modelVersion
;
}
private
void
initModelVersion
(
ModelVersion
modelVersion
,
TuningRun
tuningRun
,
ModelVersion
modelVersionSource
)
{
private
void
initModelVersion
(
ModelVersion
modelVersion
,
TuningRun
tuningRun
,
ModelVersion
modelVersionSource
)
{
modelVersion
.
setRunId
(
tuningRun
.
getRunId
());
modelVersion
.
setTaskId
(
tuningRun
.
getTaskId
());
modelVersion
.
setBaseModel
(
modelVersionSource
.
getVersionName
());
...
...
@@ -323,7 +326,8 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
TuningTask
tuningTask
=
this
.
tuningTaskService
.
getById
(
tuningRun
.
getTaskId
());
modelVersion
.
setTrainingTask
(
tuningTask
.
getTaskName
());
}
private
void
initModelTask
(
ModelTask
modelTask
,
TuningRun
tuningRun
,
ModelVersion
modelVersion
){
private
void
initModelTask
(
ModelTask
modelTask
,
TuningRun
tuningRun
,
ModelVersion
modelVersion
)
{
modelTask
.
setModelVersion
(
modelVersion
.
getModelVersion
());
modelTask
.
setModelId
(
modelVersion
.
getModelId
());
modelTask
.
setTaskType
(
0
);
...
...
@@ -332,8 +336,9 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
modelTask
.
setVersionName
(
modelVersion
.
getVersionName
());
modelTask
.
setTaskId
(
tuningRun
.
getTaskId
());
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
Boolean
updateStatus
(
Boolean
flag
,
TuningRun
tuningRun
,
ModelVersion
modelVersionTarget
,
String
targetModelVersionURl
,
ModelTask
modelTask
)
{
public
Boolean
updateStatus
(
Boolean
flag
,
TuningRun
tuningRun
,
ModelVersion
modelVersionTarget
,
String
targetModelVersionURl
,
ModelTask
modelTask
)
{
if
(
flag
)
{
modelVersionTarget
.
setModelUrl
(
targetModelVersionURl
);
modelVersionTarget
.
setStatus
(
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment