Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ jobs:
# base-url은 끝에 슬래시를 붙이지 않는다. 붙이면 //api/v1/... 로 요청이 나가 404가 된다.
printf 'SCHEDULE_FASTAPI_ENABLED=true\n'
printf 'SCHEDULE_FASTAPI_BASE_URL=http://data-ai:8010\n'

printf 'SPONTANEOUS_FASTAPI_ENABLED=true\n'
printf 'SPONTANEOUS_FASTAPI_BASE_URL=http://data-ai:8010\n'

printf 'PLACE_THEME_AI_ENABLED=true\n'
printf 'PLACE_THEME_AI_BASE_URL=http://data-ai:8010/\n'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.server.external.spontaneous;

import java.util.Map;

import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestClient;

@Component
public class FastApiSpontaneousClient {

private final RestClient restClient;
private final FastApiSpontaneousProperties properties;

public FastApiSpontaneousClient(
@Qualifier("fastApiSpontaneousRestClient") RestClient restClient,
FastApiSpontaneousProperties properties
) {
this.restClient = restClient;
this.properties = properties;
}

public Map<String, Object> recommendDestinations(
Map<String, Object> request
) {
if (!properties.enabled()) {
throw new IllegalStateException(
"Spontaneous FastAPI is disabled"
);
}

return restClient.post()
.uri("/api/v1/spontaneous-trips/destinations")
.body(request)
.retrieve()
.body(Map.class);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.server.external.spontaneous;

import java.net.http.HttpClient;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.JdkClientHttpRequestFactory;
import org.springframework.web.client.RestClient;

@Configuration
public class FastApiSpontaneousConfig {

@Bean
RestClient fastApiSpontaneousRestClient(
FastApiSpontaneousProperties properties
) {
HttpClient httpClient = HttpClient.newBuilder()
.version(HttpClient.Version.HTTP_1_1)
.connectTimeout(properties.connectTimeout())
.build();

JdkClientHttpRequestFactory requestFactory =
new JdkClientHttpRequestFactory(httpClient);

requestFactory.setReadTimeout(properties.readTimeout());

return RestClient.builder()
.baseUrl(properties.baseUrl())
.requestFactory(requestFactory)
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.server.external.spontaneous;

import java.time.Duration;
import org.springframework.boot.context.properties.ConfigurationProperties;

@ConfigurationProperties(prefix = "app.spontaneous-fastapi")
public record FastApiSpontaneousProperties(
boolean enabled,
String baseUrl,
Duration connectTimeout,
Duration readTimeout
) {

public FastApiSpontaneousProperties {
if (baseUrl == null || baseUrl.isBlank()) {
baseUrl = "http://127.0.0.1:8010";
}

if (connectTimeout == null) {
connectTimeout = Duration.ofSeconds(3);
}

if (readTimeout == null) {
readTimeout = Duration.ofSeconds(30);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.server.spontaneous;

import com.server.external.spontaneous.FastApiSpontaneousClient;

import java.util.Map;

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;

@RestController
@RequestMapping("/api/v1/spontaneous-trips")
public class SpontaneousTripController {

private final FastApiSpontaneousClient fastApiSpontaneousClient;

public SpontaneousTripController(
FastApiSpontaneousClient fastApiSpontaneousClient
) {
this.fastApiSpontaneousClient = fastApiSpontaneousClient;
}

@PostMapping("/destinations")
public ResponseEntity<Map<String, Object>> recommendDestinations(
@RequestBody Map<String, Object> request
) {
Map<String, Object> response =
fastApiSpontaneousClient.recommendDestinations(request);

return ResponseEntity.ok(response);
}
}
7 changes: 7 additions & 0 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ app:
base-url: ${SCHEDULE_FASTAPI_BASE_URL:http://127.0.0.1:8010}
connect-timeout: ${SCHEDULE_FASTAPI_CONNECT_TIMEOUT:3s}
read-timeout: ${SCHEDULE_FASTAPI_READ_TIMEOUT:15s}
# -----------
spontaneous-fastapi:
enabled: ${SPONTANEOUS_FASTAPI_ENABLED:false}
base-url: ${SPONTANEOUS_FASTAPI_BASE_URL:http://127.0.0.1:8010}
connect-timeout: ${SPONTANEOUS_FASTAPI_CONNECT_TIMEOUT:3s}
read-timeout: ${SPONTANEOUS_FASTAPI_READ_TIMEOUT:30s}
#---------------
place-ingestion:
tour-api:
enabled: ${TOUR_API_PLACE_INGESTION_ENABLED:false}
Expand Down
Loading