Skip to content

Commit 9cb1497

Browse files
phantom-rabbitruibo.qin
andauthored
refactor(space): replace hardcoded engine version with constant and improve lookup logic (#773)
Replace hardcoded engine version number with constant EngineVersion103 to enhance maintainability For the latest runtime framework, use the new FindSpaceLatestVersion method instead of hardcoded version lookup Co-authored-by: ruibo.qin <rb.qin@opencsg.com>
1 parent ca6b04c commit 9cb1497

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

component/space.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,16 +1000,16 @@ func (c *spaceComponentImpl) Deploy(ctx context.Context, namespace, name, curren
10001000
var err error
10011001
if (space.Sdk == types.GRADIO.Name && space.SdkVersion != types.GRADIO.Version) ||
10021002
(space.Sdk == types.STREAMLIT.Name && space.SdkVersion != types.STREAMLIT.Version) {
1003-
// Using old base image 1.0.3 for old spaces, will be removed in the future
1004-
frame, err = c.rfs.FindByFrameNameAndDriverVersion(ctx, "space", "1.0.3", space.DriverVersion)
1003+
slog.InfoContext(ctx, "Using old base image 1.0.3 for old spaces")
1004+
frame, err = c.rfs.FindByFrameNameAndDriverVersion(ctx, "space", EngineVersion103, space.DriverVersion)
10051005
if err != nil {
1006-
return -1, fmt.Errorf("cannot find available (1.0.3) runtime framework, %w", err)
1006+
return -1, fmt.Errorf("cannot find available (%s) runtime framework, %w", EngineVersion103, err)
10071007
}
10081008
} else {
1009-
// 1.0.4
1010-
frame, err = c.rfs.FindByFrameNameAndDriverVersion(ctx, "space", "1.0.4", space.DriverVersion)
1009+
// use latest base space runtime image
1010+
frame, err = c.rfs.FindSpaceLatestVersion(ctx, "space", space.DriverVersion)
10111011
if err != nil {
1012-
return -1, fmt.Errorf("cannot find available (1.0.4) runtime framework, %w", err)
1012+
return -1, fmt.Errorf("cannot find available latest space runtime framework, %w", err)
10131013
}
10141014
}
10151015

component/space_ce_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,7 @@ func TestSpaceComponent_Deploy(t *testing.T) {
189189
sc.mocks.stores.UserMock().EXPECT().FindByUsername(ctx, "user").Return(database.User{
190190
Username: "user1",
191191
}, nil)
192-
sc.mocks.stores.RuntimeFrameworkMock().EXPECT().FindByFrameNameAndDriverVersion(ctx, mock.Anything, mock.Anything, mock.Anything).Return(nil, nil)
193-
192+
sc.mocks.stores.RuntimeFrameworkMock().EXPECT().FindSpaceLatestVersion(ctx, mock.Anything, mock.Anything).Return(&database.RuntimeFramework{}, nil)
194193
t.Run("Deploy", func(t *testing.T) {
195194
sc.mocks.stores.SpaceMock().EXPECT().FindByPath(ctx, "ns1", "n1").Return(&database.Space{
196195
ID: 1,

0 commit comments

Comments
 (0)