Test

build.gradle

@@ -3,6 +3,22 @@ plugins {
     id 'org.springframework.boot' version '4.0.2'
     id 'io.spring.dependency-management' version '1.1.7'
 }
+configurations.configureEach {
+    resolutionStrategy {
+        force 'com.google.protobuf:protobuf-java:4.34.0'
+        force 'com.google.protobuf:protobuf-java-util:4.34.0'
+        eachDependency { details ->
+            if (details.requested.group == 'com.google.protobuf' && (details.requested.name == 'protobuf-java' || details.requested.name == 'protobuf-java-util')) {
+                details.useVersion '4.34.0'
+                details.because 'Keep protobuf runtime aligned with generated proto-common classes'
+            }
+        }
+    }
+}
+
+ext {
+    springCloudVersion = "2025.1.0"
+}
 
 group = 'com.isums'
 version = '0.0.1-SNAPSHOT'
@@ -15,21 +31,54 @@ java {
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
+    maven { url 'https://h2o-release.s3.amazonaws.com/h2o/latest_stable/maven/repo' }
+    maven {
+        name = "GitHubPackagesObservability"
+        url = uri("https://maven.pkg.github.com/Management-System-for-Rental-SEP490/ISUMS_Observability-Common")
+        credentials {
+            username = System.getenv("GITHUB_ACTOR") ?: ""
+            password = System.getenv("GITHUB_TOKEN") ?: ""
+        }
+    }
 }
 
 dependencies {
+    implementation 'net.logstash.logback:logstash-logback-encoder:8.1'
+    implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
+    implementation 'io.micrometer:micrometer-tracing-bridge-otel'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'com.isums:isums-observability-common:1.0-SNAPSHOT'
+    implementation "com.isums:proto-common:1.0-SNAPSHOT"
     implementation 'org.springframework.boot:spring-boot-starter-webmvc'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-kafka'
     implementation 'software.amazon.awssdk:s3:2.41.31'
+    implementation 'software.amazon.awssdk:translate:2.41.31'
+    implementation 'software.amazon.awssdk:bedrockruntime:2.41.31'
     implementation 'com.github.ben-manes.caffeine:caffeine'
     implementation 'ai.h2o:h2o-genmodel:3.46.0.9'
-    implementation 'org.projectlombok:lombok'
-    testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
+    testImplementation 'org.springframework.boot:spring-boot-starter-kafka-test'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion"
+    }
 }
 
 tasks.named('test') {
     useJUnitPlatform()
 }
+
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = "UTF-8"
+}

src/main/java/com/isums/aiservice/configs/AwsConfig.java

@@ -1,15 +1,31 @@
-package com.isums.aiservice.configs;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3Client;
-
-@Configuration
-public class AwsConfig {
+package com.isums.aiservice.configs;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.translate.TranslateClient;
+
+@Configuration
+@EnableConfigurationProperties(TranslationProperties.class)
+public class AwsConfig {
 
     @Bean
-    public S3Client s3Client() {
-        return S3Client.builder().region(Region.AP_SOUTHEAST_1).build();
-    }
-}
+    public S3Client s3Client() {
+        return S3Client.builder().region(Region.AP_SOUTHEAST_1).build();
+    }
+
+    @Bean
+    public TranslateClient translateClient() {
+        return TranslateClient.builder().region(Region.AP_SOUTHEAST_1).build();
+    }
+
+    @Bean
+    public BedrockRuntimeClient bedrockRuntimeClient(TranslationProperties translationProperties) {
+        return BedrockRuntimeClient.builder()
+                .region(Region.of(translationProperties.getCustomerFacing().getBedrockRegion()))
+                .build();
+    }
+}

src/main/java/com/isums/aiservice/configs/InternalAuthFilter.java

@@ -0,0 +1,88 @@
+package com.isums.aiservice.configs;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Component;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class InternalAuthFilter extends OncePerRequestFilter {
+
+    @Value("${ai.internal.enabled:true}")
+    private boolean enabled;
+
+    @Value("${ai.internal.token:}")
+    private String token;
+
+    @Value("${ai.internal.publicPaths:/api/ai/scoring/health}")
+    private String publicPaths;
+
+    private final AntPathMatcher matcher = new AntPathMatcher();
+
+    private boolean isPublicPath(String path) {
+        List<String> pubs = Arrays.stream(publicPaths.split(","))
+                .map(String::trim)
+                .filter(s -> !s.isBlank())
+                .toList();
+
+        for (String p : pubs) {
+            if (matcher.match(p, path) || p.equals(path)) return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, FilterChain chain)
+            throws IOException, ServletException {
+
+        if (!enabled) {
+            chain.doFilter(req, res);
+            return;
+        }
+
+        String path = req.getRequestURI();
+
+        if (HttpMethod.OPTIONS.matches(req.getMethod())) {
+            chain.doFilter(req, res);
+            return;
+        }
+
+        if (isPublicPath(path)) {
+            chain.doFilter(req, res);
+            return;
+        }
+
+        if (!path.startsWith("/api/ai/")) {
+            chain.doFilter(req, res);
+            return;
+        }
+
+        String auth = req.getHeader("Authorization");
+        String expected = "Bearer " + token;
+
+        if (token == null || token.isBlank()) {
+            res.setStatus(500);
+            res.getWriter().write("ai.internal.token is empty");
+            return;
+        }
+
+        if (auth == null || !auth.equals(expected)) {
+            res.setStatus(401);
+            res.getWriter().write("unauthorized");
+            return;
+        }
+
+        chain.doFilter(req, res);
+    }
+}

src/main/java/com/isums/aiservice/configs/TranslationProperties.java

@@ -0,0 +1,27 @@
+package com.isums.aiservice.configs;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+@ConfigurationProperties(prefix = "ai.translation")
+public class TranslationProperties {
+
+    private List<String> terminologyNames = new ArrayList<>();
+    private CustomerFacing customerFacing = new CustomerFacing();
+
+    @Getter
+    @Setter
+    public static class CustomerFacing {
+        private boolean bedrockEnabled = false;
+        private String bedrockModelId = "amazon.nova-lite-v1:0";
+        private String bedrockRegion = "us-east-1";
+        private Integer bedrockMaxTokens = 220;
+        private Float bedrockTemperature = 0.0F;
+    }
+}

src/main/java/com/isums/aiservice/controllers/ModelStoreController.java

@@ -0,0 +1,24 @@
+package com.isums.aiservice.controllers;
+
+import com.isums.aiservice.domains.dtos.ApiResponse;
+import com.isums.aiservice.domains.dtos.ApiResponses;
+import com.isums.aiservice.infrastructures.abstracts.ModelStoreService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/ai/model-store")
+@RequiredArgsConstructor
+public class ModelStoreController {
+
+    private final ModelStoreService modelStoreService;
+
+    @PostMapping("/invalidate")
+    public ApiResponse<Void> invalidate(@RequestParam String houseId, @RequestParam(required = false) String areaId) {
+        modelStoreService.invalidateCache(houseId, areaId);
+        return ApiResponses.ok(null, "Cache invalidated");
+    }
+}

src/main/java/com/isums/aiservice/controllers/ScoringController.java

@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/scoring")
+@RequestMapping("/api/ai/scoring")
 @RequiredArgsConstructor
 public class ScoringController {
 

src/main/java/com/isums/aiservice/controllers/TextTranslationController.java

@@ -0,0 +1,53 @@
+package com.isums.aiservice.controllers;
+
+import com.isums.aiservice.domains.dtos.TranslateTextRequest;
+import com.isums.aiservice.domains.dtos.TranslateTextResponse;
+import com.isums.aiservice.domains.dtos.TranslationOutcome;
+import com.isums.aiservice.services.TranslationOrchestrator;
+import com.isums.common.i18n.events.TextTranslationResultEvent;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/ai/translate")
+@RequiredArgsConstructor
+public class TextTranslationController {
+
+    private final TranslationOrchestrator orchestrator;
+
+    @PostMapping
+    public ResponseEntity<TranslateTextResponse> translate(@Valid @RequestBody TranslateTextRequest request) {
+        Map<String, TranslationOutcome> outcomes = orchestrator.translateAll(
+                request.text(),
+                request.sourceLanguage(),
+                request.targetLanguages(),
+                request.resourceType(),
+                request.intent(),
+                request.customerFacing());
+
+        Map<String, String> translations = new LinkedHashMap<>();
+        Map<String, String> statuses = new LinkedHashMap<>();
+        Map<String, String> errors = new LinkedHashMap<>();
+        String provider = "aws-translate";
+        for (Map.Entry<String, TranslationOutcome> entry : outcomes.entrySet()) {
+            TranslationOutcome outcome = entry.getValue();
+            translations.put(entry.getKey(), outcome.translatedText());
+            statuses.put(entry.getKey(), outcome.status());
+            if (TextTranslationResultEvent.STATUS_FAILED.equals(outcome.status()) && outcome.errorMessage() != null) {
+                errors.put(entry.getKey(), outcome.errorMessage());
+            }
+            if (outcome.provider() != null) {
+                provider = outcome.provider();
+            }
+        }
+        return ResponseEntity.ok(new TranslateTextResponse(translations, statuses, provider, errors));
+    }
+}

src/main/java/com/isums/aiservice/cores/ModelKeyResolver.java

@@ -7,25 +7,25 @@
 @RequiredArgsConstructor
 public class ModelKeyResolver {
 
-    public static String lastestKey(String prefix, UUID houseId, UUID areaId) {
-        if (areaId != null) {
-            return "%s/house_%s/area_%s/latest.json".formatted(prefix, houseId, areaId);
-        }
+    public static String latestKey(String prefix, String houseId, String areaId, String stream) {
+        return scopePath(prefix, houseId, areaId)
+                + "/" + stream + "/latest.json";
+    }
 
-        return "%s/house_%s/latest.json".formatted(prefix, houseId);
+    public static String metaKey(String prefix, String houseId, String areaId, String stream, String version) {
+        return scopePath(prefix, houseId, areaId)
+                + "/" + stream + "/" + version + "/meta.json";
     }
 
-    public static String metaKey(String prefix, UUID houseId, UUID areaId, String version) {
-        if (areaId != null) {
-            return "%s/house_%s/area_%s/%s/meta.json".formatted(prefix, houseId, areaId, version);
-        }
-        return "%s/house_%s/%s/meta.json".formatted(prefix, houseId, version);
+    public static String mojoKey(String prefix, String houseId, String areaId, String stream, String version) {
+        return scopePath(prefix, houseId, areaId)
+                + "/" + stream + "/" + version + "/model.mojo";
     }
 
-    public static String mojoKey(String prefix, UUID houseId, UUID areaId, String version) {
-        if (areaId != null) {
-            return "%s/house_%s/area_%s/%s/model.mojo".formatted(prefix, houseId, areaId, version);
-        }
-        return "%s/house_%s/%s/model.mojo".formatted(prefix, houseId, version);
+    private static String scopePath(String prefix, String houseId, String areaId) {
+        String scope = (areaId == null || areaId.isBlank())
+                ? "house_" + houseId
+                : "house_" + houseId + "/area_" + areaId;
+        return prefix.stripTrailing() + "/" + scope;
     }
 }

src/main/java/com/isums/aiservice/domains/dtos/CustomerFacingPolishResult.java

@@ -0,0 +1,7 @@
+package com.isums.aiservice.domains.dtos;
+
+public record CustomerFacingPolishResult(
+        String text,
+        boolean usedBedrock
+) {
+}

src/main/java/com/isums/aiservice/domains/dtos/IssueTextTranslationRequestedEvent.java

@@ -0,0 +1,17 @@
+package com.isums.aiservice.domains.dtos;
+
+import java.time.Instant;
+import java.util.UUID;
+
+public record IssueTextTranslationRequestedEvent(
+        UUID requestId,
+        String resourceType,
+        UUID resourceId,
+        String text,
+        String sourceLanguage,
+        String targetLanguage,
+        String translationIntent,
+        Boolean customerFacing,
+        Instant requestedAt
+) {
+}