Skip to content

Rollback: (chore/373 자동 등록 도구 비활성화)으로 롤백#390

Merged
HeeMang-Lee merged 3 commits intodevfrom
chore/385
Aug 12, 2025
Merged

Rollback: (chore/373 자동 등록 도구 비활성화)으로 롤백#390
HeeMang-Lee merged 3 commits intodevfrom
chore/385

Conversation

@HeeMang-Lee
Copy link
Copy Markdown
Member

@HeeMang-Lee HeeMang-Lee commented Aug 12, 2025

10차 - 11, 12 배포가 실패해서
10차 - 10으로 롤백합니다.

#374 까지로 롤백

Summary by CodeRabbit

  • Bug Fixes

    • Brave 웹 검색 도구 탐색 안정성 향상 및 오류 메시지 개선
    • 검색 결과가 항상 유효한 JSON으로 반환되도록 보정
  • Refactor

    • 초기화/동기화 경로 단순화로 실행 흐름 간결화
  • Chores

    • Docker 이미지 정리(캐시 청소, 메타데이터 추가) 및 런타임 디렉터리 /apps로 통일
    • Brave Search 전역 설치 절차 단순화 및 버전 고정 해제
    • 빌드에서 테스트 실행 재활성화
    • 요청 타임아웃 60초→45초, 명령 경로 단순화, 초기화 플래그 추가, 특정 자동구성 제외

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Aug 12, 2025

Caution

Review failed

The pull request is closed.

Walkthrough

이 PR은 cs25-service의 Dockerfile을 정리(노드 패키지 설치 방식 변경, 이미지 정리, 라벨/워크디렉터리 조정)하고, BraveSearchMcpService의 클라이언트 선택/초기화 흐름을 단순화했으며, application.properties에서 MCP 관련 타임아웃·명령 경로·초기화/오토컨피그 설정을 조정했습니다.

Changes

Cohort / File(s) Change Summary
Docker 빌드/런타임 정리
cs25-service/Dockerfile
Gradle 빌드에서 테스트 미제외(-x test 제거). MCP 관련 ENV 제거. Node 전역 설치를 @modelcontextprotocol/server-brave-search 비고정 버전으로 단순화(심볼릭 링크/권한 조작 제거). apt 캐시 정리 추가. LABEL 추가, 워킹 디렉터리 /apps로 변경.
Brave MCP 클라이언트 선택 로직 단순화
cs25-service/src/main/java/.../BraveSearchMcpService.java
지연 초기화/타임아웃 로직 제거. 각 클라이언트에 대해 listTools()brave_web_search 보유 여부만 확인 후 선택. 실패 메시지에 도구명 명시. search()에서 null 콘텐츠 시 빈 JSON 객체로 기본 반환. 경미한 포맷 수정.
애플리케이션 설정 조정
cs25-service/src/main/resources/application.properties
spring.ai.mcp.client.request-timeout 60s→45s. STDIO 명령 경로를 server-brave-search로 단순화. spring.ai.mcp.client.initialized=false 추가. spring.autoconfigure.exclude=org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration 추가.

Sequence Diagram(s)

sequenceDiagram
  actor Caller
  participant Service as BraveSearchMcpService
  participant C1 as McpSyncClient[1]
  participant C2 as McpSyncClient[2]
  participant CN as McpSyncClient[n]

  Caller->>Service: search(query)
  loop 순차 클라이언트 검사
    Service->>C1: listTools()
    alt C1에 brave_web_search 없음
      Service->>C2: listTools()
      alt C2에도 없음
        Service->>CN: listTools()
      end
    end
  end
  alt 사용 가능한 클라이언트 발견
    Service->>+SelectedClient: callTool(brave_web_search, params)
    SelectedClient-->>-Service: JSON content (nullable)
    Service-->>Caller: JSON 또는 빈 객체({})
  else 미발견
    Service-->>Caller: IllegalStateException(brave_web_search 미발견)
  end
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

  • Feat/335 Brave Search(MCP) 도입 #336: 동일 서비스의 BraveSearchMcpService 및 MCP 설정 흐름을 수정한 이전/동시 변경과 직접적으로 연관.
  • 10차 배포 - 10 #375: Dockerfile의 brave-search 설치 방식과 application.properties의 동일 설정 변경을 공유.
  • 10차 배포 - 7 #368: Dockerfile의 Node/브레이브 검색 설치와 MCP 초기화 플래그 추가 등 코드 레벨에서 겹침.

Suggested reviewers

  • wannabeing
  • crocusia
  • Kimyoonbeom
  • jong-0126

Poem

밤하늘 검색, 토끼의 귀가 쫑긋 서네
도커 속 당근 상자, 깔끔히 정리됐네 🥕
도구를 차례로 톡톡, 맞는 걸 찾고
못 찾으면 꽁, 찾으면 쏙!
빈 주머니면 빈 JSON, 그래도 난 행복해 ⛅️


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d4dd83b and 716bc22.

📒 Files selected for processing (3)
  • cs25-service/Dockerfile (3 hunks)
  • cs25-service/src/main/java/com/example/cs25service/domain/ai/service/BraveSearchMcpService.java (2 hunks)
  • cs25-service/src/main/resources/application.properties (1 hunks)
✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch chore/385

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

CodeRabbit Commands (Invoked using PR/Issue comments)

Type @coderabbitai help to get the list of available commands.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Status, Documentation and Community

  • Visit our Status Page to check the current availability of CodeRabbit.
  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@HeeMang-Lee HeeMang-Lee merged commit b411cbf into dev Aug 12, 2025
1 of 2 checks passed
@HeeMang-Lee HeeMang-Lee deleted the chore/385 branch August 12, 2025 07:02
@wannabeing wannabeing changed the title Chore/385 Rollback: (#374)으로 롤백 Aug 12, 2025
@wannabeing wannabeing changed the title Rollback: (#374)으로 롤백 Rollback: (chore/373 자동 등록 도구 비활성화)으로 롤백 Aug 12, 2025
@HeeMang-Lee HeeMang-Lee restored the chore/385 branch August 12, 2025 07:36
@wannabeing wannabeing deleted the chore/385 branch August 12, 2025 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants