Update dependencies, fix emergent issues (#1061)

griptape-ai · Aug 15, 2024 · adb660e · adb660e
1 parent babc56a
commit adb660e
Show file tree

Hide file tree

Showing 9 changed files with 1,038 additions and 999 deletions.
diff --git a/griptape/config/drivers/amazon_bedrock_driver_config.py b/griptape/config/drivers/amazon_bedrock_driver_config.py
@@ -12,6 +12,7 @@
     AmazonBedrockTitanEmbeddingDriver,
     BaseEmbeddingDriver,
     BaseImageGenerationDriver,
+    BaseImageQueryDriver,
     BasePromptDriver,
     BaseVectorStoreDriver,
     BedrockClaudeImageQueryModelDriver,
@@ -63,7 +64,7 @@ class AmazonBedrockDriverConfig(DriverConfig):
         kw_only=True,
         metadata={"serializable": True},
     )
-    image_query: BaseImageGenerationDriver = field(
+    image_query: BaseImageQueryDriver = field(
         default=Factory(
             lambda self: AmazonBedrockImageQueryDriver(
                 session=self.session,

diff --git a/griptape/drivers/audio_transcription/openai_audio_transcription_driver.py b/griptape/drivers/audio_transcription/openai_audio_transcription_driver.py
@@ -12,7 +12,7 @@
 
 @define
 class OpenAiAudioTranscriptionDriver(BaseAudioTranscriptionDriver):
-    api_type: str = field(default=openai.api_type, kw_only=True)
+    api_type: Optional[str] = field(default=openai.api_type, kw_only=True)
     api_version: Optional[str] = field(default=openai.api_version, kw_only=True, metadata={"serializable": True})
     base_url: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": True})
     api_key: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": False})

diff --git a/griptape/drivers/event_listener/griptape_cloud_event_listener_driver.py b/griptape/drivers/event_listener/griptape_cloud_event_listener_driver.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+from typing import Optional
 from urllib.parse import urljoin
 
 import requests
@@ -25,12 +26,14 @@ class GriptapeCloudEventListenerDriver(BaseEventListenerDriver):
         default=Factory(lambda: os.getenv("GT_CLOUD_BASE_URL", "https://cloud.griptape.ai")),
         kw_only=True,
     )
-    api_key: str = field(default=Factory(lambda: os.getenv("GT_CLOUD_API_KEY")), kw_only=True)
+    api_key: Optional[str] = field(default=Factory(lambda: os.getenv("GT_CLOUD_API_KEY")), kw_only=True)
     headers: dict = field(
         default=Factory(lambda self: {"Authorization": f"Bearer {self.api_key}"}, takes_self=True),
         kw_only=True,
     )
-    structure_run_id: str = field(default=Factory(lambda: os.getenv("GT_CLOUD_STRUCTURE_RUN_ID")), kw_only=True)
+    structure_run_id: Optional[str] = field(
+        default=Factory(lambda: os.getenv("GT_CLOUD_STRUCTURE_RUN_ID")), kw_only=True
+    )
 
     @structure_run_id.validator  # pyright: ignore[reportAttributeAccessIssue]
     def validate_run_id(self, _: Attribute, structure_run_id: str) -> None:

diff --git a/griptape/drivers/image_generation/openai_image_generation_driver.py b/griptape/drivers/image_generation/openai_image_generation_driver.py
@@ -33,7 +33,7 @@ class OpenAiImageGenerationDriver(BaseImageGenerationDriver):
             a base64 encoded image in a JSON object.
     """
 
-    api_type: str = field(default=openai.api_type, kw_only=True)
+    api_type: Optional[str] = field(default=openai.api_type, kw_only=True)
     api_version: Optional[str] = field(default=openai.api_version, kw_only=True, metadata={"serializable": True})
     base_url: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": True})
     api_key: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": False})

diff --git a/griptape/drivers/image_query/openai_image_query_driver.py b/griptape/drivers/image_query/openai_image_query_driver.py
@@ -18,7 +18,7 @@
 @define
 class OpenAiImageQueryDriver(BaseImageQueryDriver):
     model: str = field(kw_only=True, metadata={"serializable": True})
-    api_type: str = field(default=openai.api_type, kw_only=True)
+    api_type: Optional[str] = field(default=openai.api_type, kw_only=True)
     api_version: Optional[str] = field(default=openai.api_version, kw_only=True, metadata={"serializable": True})
     base_url: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": True})
     api_key: Optional[str] = field(default=None, kw_only=True)

diff --git a/griptape/drivers/observability/griptape_cloud_observability_driver.py b/griptape/drivers/observability/griptape_cloud_observability_driver.py
@@ -23,11 +23,13 @@ class GriptapeCloudObservabilityDriver(OpenTelemetryObservabilityDriver):
     base_url: str = field(
         default=Factory(lambda: os.getenv("GT_CLOUD_BASE_URL", "https://cloud.griptape.ai")), kw_only=True
     )
-    api_key: str = field(default=Factory(lambda: os.getenv("GT_CLOUD_API_KEY")), kw_only=True)
+    api_key: Optional[str] = field(default=Factory(lambda: os.getenv("GT_CLOUD_API_KEY")), kw_only=True)
     headers: dict = field(
         default=Factory(lambda self: {"Authorization": f"Bearer {self.api_key}"}, takes_self=True), kw_only=True
     )
-    structure_run_id: str = field(default=Factory(lambda: os.getenv("GT_CLOUD_STRUCTURE_RUN_ID")), kw_only=True)
+    structure_run_id: Optional[str] = field(
+        default=Factory(lambda: os.getenv("GT_CLOUD_STRUCTURE_RUN_ID")), kw_only=True
+    )
     span_processor: SpanProcessor = field(
         default=Factory(
             lambda self: import_optional_dependency("opentelemetry.sdk.trace.export").BatchSpanProcessor(

diff --git a/griptape/drivers/text_to_speech/openai_text_to_speech_driver.py b/griptape/drivers/text_to_speech/openai_text_to_speech_driver.py
@@ -18,7 +18,7 @@ class OpenAiTextToSpeechDriver(BaseTextToSpeechDriver):
         metadata={"serializable": True},
     )
     format: Literal["mp3", "opus", "aac", "flac"] = field(default="mp3", kw_only=True, metadata={"serializable": True})
-    api_type: str = field(default=openai.api_type, kw_only=True)
+    api_type: Optional[str] = field(default=openai.api_type, kw_only=True)
     api_version: Optional[str] = field(default=openai.api_version, kw_only=True, metadata={"serializable": True})
     base_url: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": True})
     api_key: Optional[str] = field(default=None, kw_only=True)