Merge branch 'spring_fix' into develop

Author: CutTheWire

rebuild.bat

@@ -50,10 +50,18 @@ FOR /d /r .\fastapi\ %%i IN (__pycache__) DO (
 )
 echo.
 
+echo Docker Compose build...
+docker-compose build --parallel
+if errorlevel 1 (
+    echo Failed to execute docker-compose build. Exiting...
+    exit /b 1
+)
+echo.
+
 echo Starting Docker Compose...
 docker-compose up -d
 if errorlevel 1 (
     echo Failed to execute docker-compose up. Exiting...
     exit /b 1
 )
-ENDLOCAL
+ENDLOCAL

springboot/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https://downloads.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

springboot/src/main/java/com/TreeNut/ChatBot_Backend/controller/RoomController.kt

@@ -68,7 +68,7 @@ class RoomController(
     @PostMapping("/office/{id}/load_logs")
     fun loadChatLogs(
         @RequestHeader("Authorization") authorization: String?,
-        @PathVariable id: String 
+        @PathVariable id: String
     ): Mono<ResponseEntity<Map<String, Any>>> {
         val token = authorization
             ?: return Mono.just(ResponseEntity.badRequest().body(mapOf("status" to 401, "message" to "토큰 없음")))
@@ -127,8 +127,6 @@ class RoomController(
         val inputDataSet = inputData["input_data_set"]
             ?: return Mono.just(ResponseEntity.badRequest().body(mapOf("status" to 400, "message" to "input_data_set이 필요합니다.")))
 
-        val outputDataSet = "TESTING⚠️TESTING⚠️TESTING"
-
         return roomService.addOfficeroom(userId, id, inputDataSet)
             .map { response ->
                 ResponseEntity.ok(mapOf(
@@ -143,7 +141,7 @@ class RoomController(
                     "message" to "채팅 로그 저장에 실패했습니다."
                 ))
             )
-        }
+    }
 
     @PutMapping("/office/{id}/update_log")
     fun updateChatLog(

springboot/src/main/java/com/TreeNut/ChatBot_Backend/service/RoomService.kt

@@ -14,7 +14,7 @@ import reactor.core.scheduler.Schedulers
 @Service
 class RoomService(
     private val chatroomRepository: ChatroomRepository,
-    private val officeroomRepository: OfficeroomRepository, // OfficeroomRepository 추가
+    private val officeroomRepository: OfficeroomRepository,
     private val webClient: WebClient.Builder
 ) {
 
@@ -32,35 +32,58 @@ class RoomService(
             .bodyToMono(Map::class.java)
     }
 
-    fun addOfficeroom(
-            userid: String,
-            mongo_officeroomid: String,
-            input_data_set: String,
-            output_data_set: String = "TESTING⚠️TESTING⚠️TESTING" // AI Model 도입 전임으로 임시로 설정
-        ): Mono<Map<*, *>> {
-
-        val requestBody = mapOf(
-            "user_id" to userid,
-            "id" to mongo_officeroomid,
-            "input_data" to input_data_set,
-            "output_data" to output_data_set
+    // Llama 모델로 input_data_set을 보내고 스트리밍 응답을 받는 함수
+    private fun getLlamaResponse(inputDataSet: String): Mono<String> {
+        val llamaRequestBody = mapOf(
+            "input_data" to inputDataSet
         )
 
         return webClient.build()
-            .put()
-            .uri("/mongo/office/save_log")
+            .post()
+            .uri("http://192.168.219.100:8000/Llama_stream")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(requestBody)
+            .bodyValue(llamaRequestBody)
             .retrieve()
-            .bodyToMono(Map::class.java)
+            .bodyToFlux(String::class.java)  // 스트리밍 응답 받기
+            .reduce { accumulated, chunk -> accumulated + chunk }  // 스트림을 하나의 문자열로 합치기
+            .map { response ->
+                response.ifEmpty { "Llama 응답 실패" }
+            }
+    }
+
+
+    fun addOfficeroom(
+        userid: String,
+        mongo_officeroomid: String,
+        input_data_set: String
+    ): Mono<Map<*, *>> {
+
+        // Llama 모델에 input_data_set을 보내고 응답을 받음
+        return getLlamaResponse(input_data_set).flatMap { output_data_set ->
+
+            val requestBody = mapOf(
+                "user_id" to userid,
+                "id" to mongo_officeroomid,
+                "input_data" to input_data_set,
+                "output_data" to output_data_set
+            )
+
+            webClient.build()
+                .put()
+                .uri("/mongo/office/save_log")
+                .contentType(MediaType.APPLICATION_JSON)
+                .bodyValue(requestBody)
+                .retrieve()
+                .bodyToMono(Map::class.java)
+        }
     }
 
     fun saveOfficeroom(userid: String, mongo_officeroomid: String): Officeroom {
         val newOfficeroom = Officeroom(
             userid = userid,
             mongo_officeroomid = mongo_officeroomid
         )
-        return officeroomRepository.save(newOfficeroom) // OfficeroomRepository를 사용하여 저장
+        return officeroomRepository.save(newOfficeroom)
     }
 
     fun saveChatroom(userid: String, charactersIdx: Int = 0, mongo_chatroomid: String): Chatroom {
@@ -69,7 +92,7 @@ class RoomService(
             charactersIdx = charactersIdx,
             mongo_chatroomid = mongo_chatroomid
         )
-        return chatroomRepository.save(newChatroom) // ChatroomRepository를 사용하여 저장
+        return chatroomRepository.save(newChatroom)
     }
 
     fun loadOfficeroomLogs(userid: String, mongo_chatroomid: String): Mono<Map<*, *>> {
@@ -80,68 +103,72 @@ class RoomService(
 
         return webClient.build()
             .post()
-            .uri("/mongo/office/load_log")  // FastAPI 서버에서 로그를 불러오는 엔드포인트
+            .uri("/mongo/office/load_log")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(requestBody)
             .retrieve()
             .bodyToMono(Map::class.java)
     }
 
     fun deleteOfficeroom(userid: String, mongo_officeroomid: String): Mono<Map<*, *>> {
-    val requestBody = mapOf(
-        "user_id" to userid,
-        "id" to mongo_officeroomid
-    )
-
-    return webClient.build()
-        .method(HttpMethod.DELETE)
-        .uri("/mongo/office/delete_room")
-        .contentType(MediaType.APPLICATION_JSON)  // 여기에서 contentType 설정
-        .bodyValue(requestBody)
-        .retrieve()
-        .bodyToMono(Map::class.java)
+        val requestBody = mapOf(
+            "user_id" to userid,
+            "id" to mongo_officeroomid
+        )
+
+        return webClient.build()
+            .method(HttpMethod.DELETE)
+            .uri("/mongo/office/delete_room")
+            .contentType(MediaType.APPLICATION_JSON)
+            .bodyValue(requestBody)
+            .retrieve()
+            .bodyToMono(Map::class.java)
     }
 
     fun updateOfficeroomLog(
         userid: String,
         mongo_officeroomid: String,
-        index: Int,  // 수정할 로그의 인덱스
-        input_data_set: String,
-        output_data_set: String = "TESTING⚠️TESTING⚠️TESTING" // AI Model 도입 전임으로 임시 설정
+        index: Int,
+        input_data_set: String
     ): Mono<Map<*, *>> {
+
+        // Llama 모델에 input_data_set을 보내고 응답을 받음
+        return getLlamaResponse(input_data_set).flatMap { output_data_set ->
+
+            val requestBody = mapOf(
+                "user_id" to userid,
+                "id" to mongo_officeroomid,
+                "index" to index,
+                "input_data" to input_data_set,
+                "output_data" to output_data_set
+            )
+
+            webClient.build()
+                .put()
+                .uri("/mongo/office/update_log")
+                .contentType(MediaType.APPLICATION_JSON)
+                .bodyValue(requestBody)
+                .retrieve()
+                .bodyToMono(Map::class.java)
+        }
+    }
+
+    fun deleteOfficeroomLog(userid: String, mongo_officeroomid: String, index: Int): Mono<Map<*, *>> {
         val requestBody = mapOf(
             "user_id" to userid,
             "id" to mongo_officeroomid,
-            "index" to index,  // 수정할 인덱스 전달
-            "input_data" to input_data_set,
-            "output_data" to output_data_set
+            "index" to index
         )
 
         return webClient.build()
-            .put()
-            .uri("/mongo/office/update_log")  // FastAPI 서버로 수정 요청
+            .method(HttpMethod.DELETE)
+            .uri("/mongo/office/delete_log")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(requestBody)
             .retrieve()
             .bodyToMono(Map::class.java)
     }
 
-    fun deleteOfficeroomLog(userid: String, mongo_officeroomid: String, index: Int): Mono<Map<*, *>> {
-    val requestBody = mapOf(
-        "user_id" to userid,
-        "id" to mongo_officeroomid,
-        "index" to index  // 삭제할 로그의 인덱스를 전달
-    )
-
-    return webClient.build()
-        .method(HttpMethod.DELETE)
-        .uri("/mongo/office/delete_log")
-        .contentType(MediaType.APPLICATION_JSON)
-        .bodyValue(requestBody)
-        .retrieve()
-        .bodyToMono(Map::class.java)
-    }
-
     fun saveOfficeroomToMySQL(userid: String, mongo_chatroomid: String): Mono<Officeroom> {
         val newOfficeroom = Officeroom(
             userid = userid,