-
Notifications
You must be signed in to change notification settings - Fork 0
chore: sync workflow templates #776
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,6 @@ | |
| import os | ||
| from dataclasses import dataclass | ||
| from pathlib import Path | ||
| from typing import Any, cast | ||
|
|
||
| from tools.llm_provider import DEFAULT_MODEL, GITHUB_MODELS_BASE_URL | ||
|
|
||
|
|
@@ -34,14 +33,6 @@ | |
| DEFAULT_SLOT_CONFIG_PATH = Path(__file__).resolve().parent.parent / "config" / "llm_slots.json" | ||
|
|
||
|
|
||
| def _load_chat_anthropic() -> type[Any] | None: | ||
| try: | ||
| from langchain_anthropic import ChatAnthropic | ||
| except ImportError: | ||
| return None | ||
| return cast(type[Any], ChatAnthropic) | ||
|
|
||
|
|
||
| def _env_int(name: str, default: int) -> int: | ||
| value = os.environ.get(name) | ||
| if not value: | ||
|
|
@@ -225,7 +216,10 @@ def build_chat_client( | |
| except ImportError: | ||
| return None | ||
|
|
||
| chat_anthropic = _load_chat_anthropic() | ||
| try: | ||
| from langchain_anthropic import ChatAnthropic | ||
| except ImportError: | ||
| ChatAnthropic = None # noqa: N806 | ||
|
|
||
| github_token = os.environ.get("GITHUB_TOKEN") | ||
| openai_token = os.environ.get("OPENAI_API_KEY") | ||
|
|
@@ -272,11 +266,11 @@ def build_chat_client( | |
| return None | ||
|
|
||
| if selected_provider == PROVIDER_ANTHROPIC: | ||
| if not anthropic_token or chat_anthropic is None: | ||
| if not anthropic_token or not ChatAnthropic: | ||
| return None | ||
| try: | ||
| client = _build_anthropic_client( | ||
| chat_anthropic, | ||
| ChatAnthropic, | ||
| model=selected_model, | ||
| token=anthropic_token, | ||
| timeout=selected_timeout, | ||
|
|
@@ -303,10 +297,10 @@ def build_chat_client( | |
| ) | ||
| used_override = True | ||
| return ClientInfo(client=client, provider=PROVIDER_OPENAI, model=slot_model) | ||
| if slot.provider == PROVIDER_ANTHROPIC and anthropic_token and chat_anthropic is not None: | ||
| if slot.provider == PROVIDER_ANTHROPIC and anthropic_token and ChatAnthropic: | ||
| with contextlib.suppress(Exception): | ||
| client = _build_anthropic_client( | ||
| chat_anthropic, | ||
| ChatAnthropic, | ||
| model=slot_model, | ||
| token=anthropic_token, | ||
| timeout=selected_timeout, | ||
|
|
@@ -342,7 +336,10 @@ def build_chat_clients( | |
| except ImportError: | ||
| return [] | ||
|
|
||
| chat_anthropic = _load_chat_anthropic() | ||
| try: | ||
| from langchain_anthropic import ChatAnthropic | ||
| except ImportError: | ||
| ChatAnthropic = None # noqa: N806 | ||
|
Comment on lines
+339
to
+342
|
||
|
|
||
| github_token = os.environ.get("GITHUB_TOKEN") | ||
| openai_token = os.environ.get("OPENAI_API_KEY") | ||
|
|
@@ -423,16 +420,12 @@ def build_chat_clients( | |
| model=second_model, | ||
| ) | ||
| ) | ||
| elif ( | ||
| selected_provider == PROVIDER_ANTHROPIC | ||
| and anthropic_token | ||
| and chat_anthropic is not None | ||
| ): | ||
| elif selected_provider == PROVIDER_ANTHROPIC and anthropic_token and ChatAnthropic: | ||
| with contextlib.suppress(Exception): | ||
| clients.append( | ||
| ClientInfo( | ||
| client=_build_anthropic_client( | ||
| chat_anthropic, | ||
| ChatAnthropic, | ||
| model=first_model, | ||
| token=anthropic_token, | ||
| timeout=selected_timeout, | ||
|
|
@@ -447,7 +440,7 @@ def build_chat_clients( | |
| clients.append( | ||
| ClientInfo( | ||
| client=_build_anthropic_client( | ||
| chat_anthropic, | ||
| ChatAnthropic, | ||
| model=second_model, | ||
| token=anthropic_token, | ||
| timeout=selected_timeout, | ||
|
|
@@ -466,9 +459,7 @@ def build_chat_clients( | |
| if any( | ||
| ( | ||
| slot.provider == PROVIDER_OPENAI and openai_token, | ||
| slot.provider == PROVIDER_ANTHROPIC | ||
| and anthropic_token | ||
| and chat_anthropic is not None, | ||
| slot.provider == PROVIDER_ANTHROPIC and anthropic_token and ChatAnthropic, | ||
| slot.provider == PROVIDER_GITHUB and github_token, | ||
| ) | ||
| ): | ||
|
|
@@ -497,12 +488,12 @@ def build_chat_clients( | |
| model=slot_model, | ||
| ) | ||
| ) | ||
| if slot.provider == PROVIDER_ANTHROPIC and anthropic_token and chat_anthropic is not None: | ||
| if slot.provider == PROVIDER_ANTHROPIC and anthropic_token and ChatAnthropic: | ||
| with contextlib.suppress(Exception): | ||
| clients.append( | ||
| ClientInfo( | ||
| client=_build_anthropic_client( | ||
| chat_anthropic, | ||
| ChatAnthropic, | ||
| model=slot_model, | ||
| token=anthropic_token, | ||
| timeout=selected_timeout, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
try/exceptimport ofChatAnthropicis now duplicated here and again inbuild_chat_clients(). Consider centralizing this into a small helper (like the removed_load_chat_anthropic) so future provider-import changes only need to be made in one place.