Merge pull request #309 from dRAGon-Okinawa/staging

Upgrade Dependencies 20241115
dRAGon-Okinawa · Nov 15, 2024 · a41ad95 · a41ad95
2 parents 850db1c + 8df8a9c
commit a41ad95
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 74 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -7,7 +7,7 @@ plugins {
 	id 'jacoco'
 	id 'checkstyle' 
 	id 'application'
-	id 'org.springframework.boot' version '3.3.4'
+	id 'org.springframework.boot' version '3.3.5'
 	id 'io.spring.dependency-management' version '1.1.6'
 	id 'org.springdoc.openapi-gradle-plugin' version '1.9.0'
 }
@@ -27,19 +27,19 @@ dependencies {
 	annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.3.3'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.3.5'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.hibernate.validator:hibernate-validator'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
 
-	implementation 'dev.langchain4j:langchain4j:0.35.0'
-    implementation 'dev.langchain4j:langchain4j-core:0.35.0'
-    implementation 'dev.langchain4j:langchain4j-embeddings:0.35.0'
-    implementation 'dev.langchain4j:langchain4j-pgvector:0.35.0'
-    implementation 'dev.langchain4j:langchain4j-easy-rag:0.35.0'
-	implementation 'dev.langchain4j:langchain4j-open-ai:0.35.0'
-	implementation 'dev.langchain4j:langchain4j-mistral-ai:0.35.0'
+	implementation 'dev.langchain4j:langchain4j:0.36.0'
+    implementation 'dev.langchain4j:langchain4j-core:0.36.0'
+    implementation 'dev.langchain4j:langchain4j-embeddings:0.36.0'
+    implementation 'dev.langchain4j:langchain4j-pgvector:0.36.0'
+    implementation 'dev.langchain4j:langchain4j-easy-rag:0.36.0'
+	implementation 'dev.langchain4j:langchain4j-open-ai:0.36.0'
+	implementation 'dev.langchain4j:langchain4j-mistral-ai:0.36.0'
 
     implementation 'org.aspectj:aspectjrt:1.9.22.1'
     implementation 'org.aspectj:aspectjweaver:1.9.22.1'
@@ -51,7 +51,7 @@ dependencies {
 	implementation 'org.dizitart:nitrite-jackson-mapper'
 
 	implementation 'net.sourceforge.argparse4j:argparse4j:0.9.0'
-	implementation 'org.jobrunr:jobrunr-spring-boot-3-starter:7.2.3'
+	implementation 'org.jobrunr:jobrunr-spring-boot-3-starter:7.3.1'
 	implementation 'me.paulschwarz:spring-dotenv:4.0.0'
 
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
@@ -60,8 +60,8 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 
-    testImplementation 'org.testcontainers:testcontainers:1.20.1'
-    testImplementation 'org.testcontainers:junit-jupiter:1.20.1'
+    testImplementation 'org.testcontainers:testcontainers:1.20.3'
+    testImplementation 'org.testcontainers:junit-jupiter:1.20.3'
 
 	compileOnly 'org.projectlombok:lombok:1.18.34'
 	annotationProcessor 'org.projectlombok:lombok:1.18.34'
@@ -86,7 +86,7 @@ openApi {
 }
 
 checkstyle {
-	toolVersion '10.18.1'
+	toolVersion '10.20.1'
     config = rootProject.resources.text.fromFile('backend/checkstyle.xml')
     ignoreFailures = false
     maxWarnings = 0

diff --git a/backend/src/main/java/ai/dragon/enumeration/ChatMemoryStrategy.java b/backend/src/main/java/ai/dragon/enumeration/ChatMemoryStrategy.java
@@ -6,6 +6,7 @@
 import ai.dragon.properties.raag.RetrievalAugmentorSettings;
 import dev.langchain4j.memory.chat.MessageWindowChatMemory;
 import dev.langchain4j.memory.chat.TokenWindowChatMemory;
+import dev.langchain4j.model.openai.OpenAiChatModelName;
 import dev.langchain4j.model.openai.OpenAiTokenizer;
 
 public enum ChatMemoryStrategy {
@@ -54,7 +55,7 @@ public ChatMemoryStrategyDefinition getChatMemoryStrategyDefinition() throws Cla
                                     .maxTokens(
                                             Optional.ofNullable(parameters.getHistoryMaxTokens())
                                                     .orElse(RetrievalAugmentorSettings.DEFAULT_MAX_TOKENS),
-                                            new OpenAiTokenizer())
+                                            new OpenAiTokenizer(OpenAiChatModelName.GPT_3_5_TURBO))
                                     .build();
                         })
                         .build();

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'pl.allegro.tech.build.axion-release' version '1.18.12'
+    id 'pl.allegro.tech.build.axion-release' version '1.18.15'
 }
 
 scmVersion {

diff --git a/frontend/mockoon_dRAGon.json b/frontend/mockoon_dRAGon.json
@@ -1,6 +1,6 @@
 {
   "uuid": "e4a84b25-cf32-4184-9259-bee079384320",
-  "lastMigration": 32,
+  "lastMigration": 33,
   "name": "dRAGon",
   "endpointPrefix": "",
   "latency": 0,
@@ -108,7 +108,9 @@
           "callbacks": []
         }
       ],
-      "responseMode": null
+      "responseMode": null,
+      "streamingMode": null,
+      "streamingInterval": 0
     },
     {
       "uuid": "cd0e8e0b-c130-4d4a-87f7-673246e250d2",
@@ -137,7 +139,9 @@
           "callbacks": []
         }
       ],
-      "responseMode": null
+      "responseMode": null,
+      "streamingMode": null,
+      "streamingInterval": 0
     },
     {
       "uuid": "65043f0b-02cd-48d3-924b-b9da53428caf",
@@ -166,7 +170,9 @@
           "callbacks": []
         }
       ],
-      "responseMode": null
+      "responseMode": null,
+      "streamingMode": null,
+      "streamingInterval": 0
     },
     {
       "uuid": "499cdef4-138c-41f4-801e-a110aaa3d48e",
@@ -195,7 +201,9 @@
           "callbacks": []
         }
       ],
-      "responseMode": null
+      "responseMode": null,
+      "streamingMode": null,
+      "streamingInterval": 0
     }
   ],
   "rootChildren": [

diff --git a/frontend/package.json b/frontend/package.json
@@ -48,53 +48,53 @@
     "@sa/hooks": "workspace:*",
     "@sa/materials": "workspace:*",
     "@sa/utils": "workspace:*",
-    "@vueuse/core": "11.1.0",
+    "@vueuse/core": "11.2.0",
     "clipboard": "2.0.11",
     "dayjs": "1.11.13",
     "echarts": "5.5.1",
     "highlight.js": "^11.10.0",
     "lodash-es": "4.17.21",
     "naive-ui": "2.40.1",
     "nprogress": "0.2.0",
-    "pinia": "2.2.4",
-    "tailwind-merge": "2.5.3",
-    "uuid": "^10.0.0",
-    "vue": "3.5.11",
-    "vue-draggable-plus": "0.5.3",
+    "pinia": "2.2.6",
+    "tailwind-merge": "2.5.4",
+    "uuid": "^11.0.3",
+    "vue": "3.5.12",
+    "vue-draggable-plus": "0.6.0",
     "vue-i18n": "10.0.4",
     "vue-router": "4.4.5"
   },
   "devDependencies": {
     "@dragon/scripts": "workspace:*",
     "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.257",
+    "@iconify/json": "2.2.272",
     "@sa/uno-preset": "workspace:*",
-    "@soybeanjs/eslint-config": "1.4.1",
+    "@soybeanjs/eslint-config": "1.4.2",
     "@types/lodash-es": "4.17.12",
-    "@types/node": "22.7.5",
+    "@types/node": "22.9.0",
     "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "0.63.3",
-    "@unocss/preset-icons": "0.63.3",
-    "@unocss/preset-uno": "0.63.3",
-    "@unocss/transformer-directives": "0.63.3",
-    "@unocss/transformer-variant-group": "0.63.3",
-    "@unocss/vite": "0.63.3",
-    "@vitejs/plugin-vue": "5.1.4",
-    "@vitejs/plugin-vue-jsx": "4.0.1",
-    "eslint": "9.12.0",
-    "eslint-plugin-vue": "9.28.0",
+    "@unocss/eslint-config": "0.64.1",
+    "@unocss/preset-icons": "0.64.1",
+    "@unocss/preset-uno": "0.64.1",
+    "@unocss/transformer-directives": "0.64.1",
+    "@unocss/transformer-variant-group": "0.64.1",
+    "@unocss/vite": "0.64.1",
+    "@vitejs/plugin-vue": "5.2.0",
+    "@vitejs/plugin-vue-jsx": "4.1.0",
+    "eslint": "9.14.0",
+    "eslint-plugin-vue": "9.31.0",
     "lint-staged": "15.2.10",
-    "sass": "1.79.4",
-    "tsx": "4.19.1",
-    "typescript": "5.6.2",
-    "unplugin-icons": "0.19.3",
+    "sass": "1.81.0",
+    "tsx": "4.19.2",
+    "typescript": "5.6.3",
+    "unplugin-icons": "0.20.1",
     "unplugin-vue-components": "0.27.4",
-    "vite": "5.4.8",
+    "vite": "5.4.11",
     "vite-plugin-progress": "0.0.7",
     "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "7.4.6",
+    "vite-plugin-vue-devtools": "7.6.4",
     "vue-eslint-parser": "9.4.3",
-    "vue-tsc": "2.1.6"
+    "vue-tsc": "2.1.10"
   },
   "lint-staged": {
     "*": "eslint --fix"

diff --git a/frontend/packages/axios/package.json b/frontend/packages/axios/package.json
@@ -16,6 +16,6 @@
     "qs": "6.13.0"
   },
   "devDependencies": {
-    "@types/qs": "6.9.16"
+    "@types/qs": "6.9.17"
   }
 }
diff --git a/frontend/packages/ofetch/package.json b/frontend/packages/ofetch/package.json
@@ -10,6 +10,6 @@
     }
   },
   "dependencies": {
-    "ofetch": "1.4.0"
+    "ofetch": "1.4.1"
   }
 }
diff --git a/frontend/packages/scripts/package.json b/frontend/packages/scripts/package.json
@@ -14,14 +14,14 @@
   },
   "devDependencies": {
     "@soybeanjs/changelog": "0.3.24",
-    "bumpp": "9.6.1",
+    "bumpp": "9.8.1",
     "c12": "2.0.1",
     "cac": "6.7.14",
     "consola": "3.2.3",
     "enquirer": "2.4.1",
-    "execa": "9.4.0",
+    "execa": "9.5.1",
     "kolorist": "1.8.0",
-    "npm-check-updates": "17.1.3",
+    "npm-check-updates": "17.1.11",
     "rimraf": "6.0.1"
   }
 }
diff --git a/frontend/packages/utils/package.json b/frontend/packages/utils/package.json
@@ -13,7 +13,7 @@
     "colord": "2.9.3",
     "crypto-js": "4.2.0",
     "localforage": "1.10.0",
-    "nanoid": "5.0.7"
+    "nanoid": "5.0.8"
   },
   "devDependencies": {
     "@types/crypto-js": "4.2.2"

diff --git a/frontend/src/styles/scss/global.scss b/frontend/src/styles/scss/global.scss
@@ -1 +1,21 @@
-@import './scrollbar.scss';
+@mixin scrollbar($size: 7px, $color: rgba(0, 0, 0, 0.5)) {
+  scrollbar-width: thin;
+  scrollbar-color: $color transparent;
+
+  &::-webkit-scrollbar-thumb {
+    background-color: $color;
+    border-radius: $size;
+  }
+  &::-webkit-scrollbar-thumb:hover {
+    background-color: $color;
+    border-radius: $size;
+  }
+  &::-webkit-scrollbar {
+    width: $size;
+    height: $size;
+  }
+  &::-webkit-scrollbar-track-piece {
+    background-color: rgba(0, 0, 0, 0);
+    border-radius: 0;
+  }
+}
diff --git a/frontend/src/styles/scss/scrollbar.scss b/frontend/src/styles/scss/scrollbar.scss