Skip to content

Commit cd3c681

Browse files
Diegi97Diegi97
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents 91c3769 + 3d5ba73 commit cd3c681

47 files changed

Lines changed: 23388 additions & 33604 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎admin/package-lock.json‎

Lines changed: 9168 additions & 5054 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin/package.json‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,45 @@
1111
"postinstall": "nuxt prepare"
1212
},
1313
"devDependencies": {
14-
"@element-plus/nuxt": "^1.0.6",
15-
"@intlify/unplugin-vue-i18n": "^0.9.2",
16-
"element-plus": "^2.3.14",
17-
"nuxt": "3.6.x",
18-
"vue-i18n": "^9.4.1"
14+
"@element-plus/nuxt": "^1.1.4",
15+
"@intlify/unplugin-vue-i18n": "^11.0.1",
16+
"element-plus": "^2.11.2",
17+
"nuxt": "3.19.x",
18+
"vue-i18n": "^11.1.12"
1919
},
2020
"dependencies": {
2121
"@averjs/nuxt-compression": "^1.2.2",
22-
"@babel/traverse": ">=7.23.2",
23-
"@element-plus/icons-vue": "^2.1.0",
24-
"@model-w/axios": "1.x",
25-
"@model-w/preset-nuxt3": "2023.7.x",
26-
"@model-w/proxy": "2.x",
27-
"@model-w/sentry": "1.x",
28-
"@nuxtjs/proxy": "^2.1.0",
29-
"@nuxtjs/sentry": "^7.5.0",
30-
"@pinia/nuxt": "^0.4.11",
22+
"@babel/traverse": ">=7.28.4",
23+
"@element-plus/icons-vue": "^2.3.2",
24+
"@model-w/axios": "*",
25+
"@model-w/preset-nuxt3": "*",
26+
"@model-w/proxy": "*",
27+
"@model-w/sentry": "*",
28+
"@nuxtjs/sentry": "*",
29+
"@pinia/nuxt": "^0.11.2",
3130
"@vuelidate/core": "2.0.x",
3231
"@vuelidate/validators": "2.0.x",
33-
"@vueuse/core": "^10.2.0",
34-
"chatfaq-widget": "^0.1.54",
35-
"defu": "^6.1.2",
36-
"http-proxy-middleware": "^2.0.6",
37-
"jsdom": "21.1.x",
38-
"mapbox-gl": "^2.15.0",
32+
"@vueuse/core": "^13.9.0",
33+
"chatfaq-widget": "^0.2.15",
34+
"defu": "^6.1.4",
35+
"http-proxy-middleware": "^3.0.5",
36+
"jsdom": "27.0.x",
37+
"mapbox-gl": "^3.15.0",
3938
"mitt": "^3.0.1",
40-
"nuxt": "3.6.x",
41-
"pinia": "2.0.x",
42-
"plyr": "^3.7.8",
43-
"postcss": ">=8.4.31",
44-
"sass": "1.63.x",
45-
"sass-loader": "^13.2.0",
46-
"swiper": "^9.4.0",
47-
"undici": "^5.27.0",
48-
"vite-svg-loader": "4.0.x",
49-
"vue": "3.3.x",
50-
"vue3-carousel": "^0.3.1",
39+
"nuxt": "3.17.x",
40+
"pinia": "3.0.x",
41+
"plyr": "^3.8.3",
42+
"postcss": ">=8.5.6",
43+
"sass": "1.89.x",
44+
"sass-loader": "^16.0.5",
45+
"swiper": "^12.0.1",
46+
"undici": "^7.16.0",
47+
"vite-svg-loader": "5.1.x",
48+
"vue": "3.5.x",
49+
"vue3-carousel": "^0.16.0",
5150
"wasync": "^0.1.1"
51+
},
52+
"overrides": {
53+
"nuxt": "3.19.x"
5254
}
5355
}

‎admin/server/middleware/ray-proxy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {defineEventHandler} from 'h3'
22
import {createProxyMiddleware} from 'http-proxy-middleware';
33
import * as path from "path"; // npm install http-proxy-middleware@beta
44

5-
const rayProxyMiddleware = createProxyMiddleware('/ray/', {
5+
const rayProxyMiddleware = createProxyMiddleware({
66
target: 'http://back:8265',
77
changeOrigin: true,
88
ws: true,

‎back/back/apps/language_model/consumers/__init__.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def merge_contents(existing: List[Content], new: List[Content]) -> List[Content]
141141
content=aggregated_contents,
142142
usage=None,
143143
stop_reason="end_turn"
144-
)
144+
).model_dump()
145145
)
146146
# Start a new group for the new role.
147147
current_role = role
@@ -155,7 +155,7 @@ def merge_contents(existing: List[Content], new: List[Content]) -> List[Content]
155155
content=aggregated_contents,
156156
usage=None,
157157
stop_reason="end_turn"
158-
)
158+
).model_dump()
159159
)
160160

161161
return aggregated_messages
@@ -283,9 +283,9 @@ async def query_llm(
283283
if messages: # In case the fsm sends messages
284284
if messages[0]["role"] == AgentType.system.value:
285285
if prev_messages[0].role == AgentType.system.value:
286-
new_messages[0] = Message(**messages[0]) # replace the original system message with the new one from the fsm
286+
new_messages[0] = messages[0].copy() # replace the original system message with the new one from the fsm
287287
else:
288-
new_messages.insert(0, Message(**messages[0])) # or add the fsm system message
288+
new_messages.insert(0, messages[0].copy()) # or add the fsm system message
289289

290290
# pop the system message
291291
messages = messages[1:]

‎back/back/apps/language_model/models/rag_pipeline.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
)
1717
from back.apps.language_model.ray_deployments import (
1818
delete_serve_app,
19-
launch_colbert_deployment,
2019
launch_e5_deployment,
2120
)
2221
from back.apps.language_model.tasks import index_task
@@ -132,9 +131,10 @@ def trigger_deploy(self):
132131
self.num_replicas,
133132
)
134133
elif self.get_retriever_type() == RetrieverTypeChoices.COLBERT:
135-
launch_colbert_deployment.options(name=task_name).remote(
136-
self.get_deploy_name(), self.s3_index_path, self.num_replicas
137-
)
134+
raise NotImplementedError("ColBERT has been deprecated. Please use the E5 retriever instead.")
135+
# launch_colbert_deployment.options(name=task_name).remote(
136+
# self.get_deploy_name(), self.s3_index_path, self.num_replicas
137+
# )
138138
else:
139139
logger.info(f"Retriever {self.name} is not enabled, skipping deploy")
140140

‎back/back/apps/language_model/ray_deployments/__init__.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import ray
22
from ray import serve
33

4-
from back.apps.language_model.ray_deployments.colbert_deployment import (
5-
launch_colbert_deployment,
6-
)
74
from back.apps.language_model.ray_deployments.e5_deployment import launch_e5_deployment
85

96
from back.apps.language_model.ray_deployments.utils import delete_serve_app

‎back/back/apps/language_model/ray_deployments/colbert_deployment.py‎

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
 (0)