Skip to content

Commit 8897a48

Browse files
committed
Merge branch 'master' into dle-4-0
2 parents f338ec0 + a65008c commit 8897a48

File tree

6 files changed

+297
-198
lines changed

6 files changed

+297
-198
lines changed

engine/.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ bash-test-16:
472472
bash-test-17:
473473
<<: *bash_test
474474
variables:
475-
POSTGRES_VERSION: 17rc1
475+
POSTGRES_VERSION: 17
476476

477477
integration-test:
478478
services:

ui/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@
4545
"express@<4.19.2": ">=4.19.2",
4646
"follow-redirects@<=1.15.5": ">=1.15.6",
4747
"@babel/traverse@<7.23.2": ">=7.23.2",
48-
"@pmmmwh/react-refresh-webpack-plugin@<0.5.13": ">=0.5.13"
48+
"bootstrap@>=4.0.0 <=4.6.2": ">=5.0.0",
49+
"elliptic@>=4.0.0 <=6.5.6": ">=6.5.7",
50+
"elliptic@>=2.0.0 <=6.5.6": ">=6.5.7",
51+
"elliptic@>=5.2.1 <=6.5.6": ">=6.5.7",
52+
"dompurify@<2.5.4": ">=2.5.4"
4953
}
5054
}
5155
}

ui/packages/platform/src/pages/Bot/Command/Command.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export const Command = React.memo((props: Props) => {
194194
if (!inputRef.current) return
195195
if (window.innerWidth > theme.breakpoints.values.md) inputRef.current.focus()
196196
if (!location.state?.skipReloading) setValue('')
197-
}, [threadId]);
197+
}, [threadId, loading]);
198198

199199
return (
200200
<div className={classes.root}>

ui/packages/platform/src/pages/Bot/hooks.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { getDebugMessages } from "../../api/bot/getDebugMessages";
2020

2121
const WS_URL = process.env.REACT_APP_WS_URL || '';
2222

23-
const DEFAULT_MODEL_NAME = 'gemini-1.5-pro'
23+
const DEFAULT_MODEL_NAME = 'gpt-4o-mini'
2424

2525
type ErrorType = {
2626
code?: number;

ui/packages/shared/pages/Instance/Configuration/utils/index.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ const seContainerRegistry = 'se-images'
77
const genericImagePrefix = 'postgresai/extended-postgres'
88
// since some tags are rc, we need to specify the exact tags to use
99
const dockerImagesConfig = {
10-
'9.6': ['0.5.0', '0.4.6', '0.4.5'],
11-
'10': ['0.5.0', '0.4.6', '0.4.5'],
12-
'11': ['0.5.0', '0.4.6', '0.4.5'],
13-
'12': ['0.5.0', '0.4.6', '0.4.5'],
14-
'13': ['0.5.0', '0.4.6', '0.4.5'],
15-
'14': ['0.5.0', '0.4.6', '0.4.5'],
16-
'15': ['0.5.0', '0.4.6', '0.4.5'],
17-
'16': ['0.5.0', '0.4.6', '0.4.5'],
18-
'17rc1': ['0.5.0'],
10+
'9.6': ['0.5.1', '0.4.6', '0.4.5'],
11+
'10': ['0.5.1', '0.4.6', '0.4.5'],
12+
'11': ['0.5.1', '0.4.6', '0.4.5'],
13+
'12': ['0.5.1', '0.4.6', '0.4.5'],
14+
'13': ['0.5.1', '0.4.6', '0.4.5'],
15+
'14': ['0.5.1', '0.4.6', '0.4.5'],
16+
'15': ['0.5.1', '0.4.6', '0.4.5'],
17+
'16': ['0.5.1', '0.4.6', '0.4.5'],
18+
'17': ['0.5.1'],
1919
}
2020

2121
export type FormValuesKey = keyof FormValues

0 commit comments

Comments
 (0)