Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix type hint for token_provider, Add missing params in AzureOpenAiCompletionPromptDriver openai client #750

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Fix type hint for token_provider, Add missing params in AzureOpenAiCompletionPromptDriver openai client #750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15b321d
fix type hint for token_provider, add missing params
vachillo Apr 17, 2024
1ddbe97
changelog
vachillo Apr 17, 2024
a7507d6
grammar
vachillo Apr 17, 2024
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
6 changes: 4 additions & 2 deletions griptape/drivers/embedding/azure_openai_embedding_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from typing import Optional
from typing import Callable, Optional
from attr import define, field, Factory
from griptape.drivers import OpenAiEmbeddingDriver
from griptape.tokenizers import OpenAiTokenizer
Expand All @@ -23,7 +23,9 @@ class AzureOpenAiEmbeddingDriver(OpenAiEmbeddingDriver):
azure_deployment: str = field(kw_only=True, metadata={"serializable": True})
azure_endpoint: str = field(kw_only=True, metadata={"serializable": True})
azure_ad_token: Optional[str] = field(kw_only=True, default=None, metadata={"serializable": False})
azure_ad_token_provider: Optional[str] = field(kw_only=True, default=None, metadata={"serializable": True})
azure_ad_token_provider: Optional[Callable[[], str]] = field(
kw_only=True, default=None, metadata={"serializable": False}
)
api_version: str = field(default="2023-05-15", kw_only=True, metadata={"serializable": True})
tokenizer: OpenAiTokenizer = field(
default=Factory(lambda self: OpenAiTokenizer(model=self.model), takes_self=True), kw_only=True
Expand Down
6 changes: 4 additions & 2 deletions griptape/drivers/image_generation/azure_openai_image_generation_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import openai
from attr import field, Factory, define
from typing import Optional
from typing import Callable, Optional

from griptape.drivers import OpenAiImageGenerationDriver

Expand All @@ -23,7 +23,9 @@ class AzureOpenAiImageGenerationDriver(OpenAiImageGenerationDriver):
azure_deployment: str = field(kw_only=True, metadata={"serializable": True})
azure_endpoint: str = field(kw_only=True, metadata={"serializable": True})
azure_ad_token: Optional[str] = field(kw_only=True, default=None, metadata={"serializable": True})
azure_ad_token_provider: Optional[str] = field(kw_only=True, default=None, metadata={"serializable": True})
azure_ad_token_provider: Optional[Callable[[], str]] = field(
kw_only=True, default=None, metadata={"serializable": False}
)
api_version: str = field(default="2024-02-01", kw_only=True, metadata={"serializable": True})
client: openai.AzureOpenAI = field(
default=Factory(
Expand Down
6 changes: 4 additions & 2 deletions griptape/drivers/prompt/azure_openai_chat_prompt_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from attr import define, field, Factory
from typing import Optional
from typing import Callable, Optional
from griptape.utils import PromptStack
from griptape.drivers import OpenAiChatPromptDriver
import openai
Expand All @@ -20,7 +20,9 @@ class AzureOpenAiChatPromptDriver(OpenAiChatPromptDriver):
azure_deployment: str = field(kw_only=True, metadata={"serializable": True})
azure_endpoint: str = field(kw_only=True, metadata={"serializable": True})
azure_ad_token: Optional[str] = field(kw_only=True, default=None, metadata={"serializable": True})
azure_ad_token_provider: Optional[str] = field(kw_only=True, default=None, metadata={"serializable": True})
azure_ad_token_provider: Optional[Callable[[], str]] = field(
kw_only=True, default=None, metadata={"serializable": False}
)
api_version: str = field(default="2023-05-15", kw_only=True, metadata={"serializable": True})
client: openai.AzureOpenAI = field(
default=Factory(
Expand Down
8 changes: 6 additions & 2 deletions griptape/drivers/prompt/azure_openai_completion_prompt_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Optional
from typing import Callable, Optional
from attr import define, field, Factory
from griptape.drivers import OpenAiCompletionPromptDriver
import openai
Expand All @@ -19,7 +19,9 @@ class AzureOpenAiCompletionPromptDriver(OpenAiCompletionPromptDriver):
azure_deployment: str = field(kw_only=True, metadata={"serializable": True})
azure_endpoint: str = field(kw_only=True, metadata={"serializable": True})
azure_ad_token: Optional[str] = field(kw_only=True, default=None, metadata={"serializable": True})
azure_ad_token_provider: Optional[str] = field(kw_only=True, default=None, metadata={"serializable": True})
azure_ad_token_provider: Optional[Callable[[], str]] = field(
kw_only=True, default=None, metadata={"serializable": False}
)
api_version: str = field(default="2023-05-15", kw_only=True, metadata={"serializable": True})
client: openai.AzureOpenAI = field(
default=Factory(
Expand All @@ -29,6 +31,8 @@ class AzureOpenAiCompletionPromptDriver(OpenAiCompletionPromptDriver):
api_version=self.api_version,
azure_endpoint=self.azure_endpoint,
azure_deployment=self.azure_deployment,
azure_ad_token=self.azure_ad_token,
azure_ad_token_provider=self.azure_ad_token_provider,
),
takes_self=True,
)
Expand Down
Loading