Merge pull request 'feat/infer_dev_260107' (#332) from feat/infer_dev_260107 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/332

src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java

@@ -46,6 +46,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -81,6 +82,9 @@ public class InferenceResultService {
   @Value("${inference.batch-url}")
   private String batchUrl;
 
+  @Value("${inference.inference-server-name}")
+  private String inferenceServerName;
+
   @Value("${file.dataset-dir}")
   private String datasetDir;
 
@@ -516,46 +520,45 @@ public class InferenceResultService {
 
   public List<InferenceServerStatusDto> getInferenceServerStatusList() {
 
+    String[] serverNames = inferenceServerName.split(",");
+    int serveCnt = serverNames.length;
+
     List<InferenceServerStatusDto> dtoList =
         inferenceResultCoreService.getInferenceServerStatusList();
     int size = dtoList.size();
 
+    List<InferenceServerStatusDto> serverStatusList = new ArrayList<>();
+
     System.out.println("size =" + size);
 
     if (size == 0) {
-      for (int k = 1; k <= 4; k++) {
+      for (int k = 0; k < serveCnt; k++) {
         InferenceServerStatusDto dto = new InferenceServerStatusDto();
-        dto.setServerName("server" + k);
+        dto.setServerName(serverNames[k]);
         dto.setCpu_user(0);
         dto.setCpu_system(0);
         dto.setMemused(0);
         dto.setKbmemused(0L);
         dto.setGpuUtil(0);
 
-        dtoList.add(dto);
+        serverStatusList.add(dto);
       }
     } else {
 
-      for (int k = 1; k <= 4; k++) {
+      for (int k = 0; k < serveCnt; k++) {
-        String srvNm = "server" + k;
+        String srvNm = serverNames[k];
         String srvNmChk = "N";
 
-        int serverCnt =
+        Optional<InferenceServerStatusDto> matchingDto =
-            (int)
+            dtoList.stream().filter(dto -> srvNm.equals(dto.getServerName())).findFirst();
-                dtoList.stream()
-                    .filter(dto -> dto.getServerName().toString().equals(srvNm))
-                    .count();
 
         /*
-        for (InferenceServerStatusDto dto : dtoList) {
+        int serverChekcCnt =
-          if (srvNm.equals(dto.getServerName())) {
+          (int)
-            srvNmChk = "Y";
+            dtoList.stream().filter(dto -> dto.getServerName().toString().equals(srvNm)).count();
-            break;
-          }
-        }
         */
 
-        if (serverCnt == 0) {
+        if (matchingDto.isEmpty()) {
           InferenceServerStatusDto dto = new InferenceServerStatusDto();
           dto.setServerName(srvNm);
           dto.setCpu_user(0);
@@ -563,14 +566,16 @@ public class InferenceResultService {
           dto.setMemused(0);
           dto.setKbmemused(0L);
           dto.setGpuUtil(0);
-          dtoList.add(dto);
+          serverStatusList.add(dto);
+        } else {
+          serverStatusList.add(matchingDto.get());
         }
       }
     }
 
-    dtoList.sort(Comparator.comparing(InferenceServerStatusDto::getServerName));
+    serverStatusList.sort(Comparator.comparing(InferenceServerStatusDto::getServerName));
 
-    return dtoList;
+    return serverStatusList;
   }
 
   /**

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java

@@ -152,10 +152,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     systemMetricEntity.cpuSystem,
                     systemMetricEntity.memused,
                     systemMetricEntity.kbmemused,
-                    gpuMetricEntity.gpuUtil
+                    gpuMetricEntity.gpuUtil))
-                    // gpuMetricEntity.gpuMemUsed,
-                    // gpuMetricEntity.gpuMemTotal
-                    ))
             .from(systemMetricEntity)
             .leftJoin(gpuMetricEntity)
             .on(
@@ -163,7 +160,10 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     .timestamp
                     .in(latestGpuIds)
                     .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName)))
-            .where(systemMetricEntity.timestamp.in(latestIds)) // In 절 사용
+            .where(
+                systemMetricEntity.timestamp.in(latestIds)
+                // .and(systemMetricEntity.serverName.ne("server2"))
+                ) // In 절 사용
             .orderBy(systemMetricEntity.serverName.asc())
             .limit(4)
             .fetch();

src/main/resources/application-dev.yml

@@ -92,7 +92,7 @@ file:
   sync-root-dir: /kamco-nfs/images/
   sync-tmp-dir: ${file.sync-root-dir}/tmp
   sync-file-extention: tfw,tif
-  sync-auto-exception-start-year: 2025
+  sync-auto-exception-start-year: 2024
   sync-auto-exception-before-year-cnt: 3
 
   #dataset-dir: D:/kamco-nfs/dataset/
@@ -109,6 +109,7 @@ inference:
   batch-url: http://10.100.0.11:8000/batches
   geojson-dir: /kamco-nfs/requests/
   jar-path: /kamco-nfs/dataset/shp_exporter-1.0.0.jar
+  inference-server-name: server1,server2,server3,server4
 
 gukyuin:
   #url:  http://localhost:8080

src/main/resources/application-prod.yml

@@ -64,6 +64,7 @@ inference:
   batch-url: http://10.100.0.11:8000/batches
   geojson-dir: /kamco-nfs/requests/
   jar-path: /kamco-nfs/dataset/shp_exporter-1.0.0.jar
+  inference-server-name: server1,server2,server3,server4
 
 gukyuin:
   #url:  http://localhost:8080