Remove kw_only from @define

griptape-ai · Feb 12, 2024 · 503bc47 · 503bc47
1 parent d2b66fa
commit 503bc47
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 21 deletions.
diff --git a/griptape/config/amazon_bedrock_structure_config.py b/griptape/config/amazon_bedrock_structure_config.py
@@ -21,7 +21,7 @@
 )
 
 
-@define(kw_only=True)
+@define()
 class AmazonBedrockStructureConfig(BaseStructureConfig):
     global_drivers: StructureGlobalDriversConfig = field(
         default=Factory(

diff --git a/griptape/config/openai_structure_config.py b/griptape/config/openai_structure_config.py
@@ -18,7 +18,7 @@
 )
 
 
-@define(kw_only=True)
+@define
 class OpenAiStructureConfig(BaseStructureConfig):
     global_drivers: StructureGlobalDriversConfig = field(
         default=Factory(

diff --git a/griptape/config/structure_config.py b/griptape/config/structure_config.py
@@ -3,7 +3,7 @@
 from griptape.config import BaseStructureConfig, StructureGlobalDriversConfig, StructureTaskMemoryConfig
 
 
-@define(kw_only=True)
+@define
 class StructureConfig(BaseStructureConfig):
     global_drivers: StructureGlobalDriversConfig = field(
         default=Factory(lambda: StructureGlobalDriversConfig()), kw_only=True, metadata={"serializable": True}

diff --git a/griptape/config/structure_global_drivers_config.py b/griptape/config/structure_global_drivers_config.py
@@ -16,7 +16,7 @@
 from griptape.mixins.serializable_mixin import SerializableMixin
 
 
-@define(kw_only=True)
+@define
 class StructureGlobalDriversConfig(SerializableMixin):
     prompt_driver: BasePromptDriver = field(
         kw_only=True, default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True}

diff --git a/griptape/config/structure_task_memory_config.py b/griptape/config/structure_task_memory_config.py
@@ -8,14 +8,16 @@
 from griptape.mixins.serializable_mixin import SerializableMixin
 
 
-@define(kw_only=True)
+@define
 class StructureTaskMemoryConfig(SerializableMixin):
     query_engine: StructureTaskMemoryQueryEngineConfig = field(
-        default=Factory(lambda: StructureTaskMemoryQueryEngineConfig()), metadata={"serializable": True}
+        kw_only=True, default=Factory(lambda: StructureTaskMemoryQueryEngineConfig()), metadata={"serializable": True}
     )
     extraction_engine: StructureTaskMemoryExtractionEngineConfig = field(
-        default=Factory(lambda: StructureTaskMemoryExtractionEngineConfig()), metadata={"serializable": True}
+        kw_only=True,
+        default=Factory(lambda: StructureTaskMemoryExtractionEngineConfig()),
+        metadata={"serializable": True},
     )
     summary_engine: StructureTaskMemorySummaryEngineConfig = field(
-        default=Factory(lambda: StructureTaskMemorySummaryEngineConfig()), metadata={"serializable": True}
+        kw_only=True, default=Factory(lambda: StructureTaskMemorySummaryEngineConfig()), metadata={"serializable": True}
     )
diff --git a/griptape/config/structure_task_memory_extraction_engine_config.py b/griptape/config/structure_task_memory_extraction_engine_config.py
@@ -4,11 +4,15 @@
 from griptape.mixins.serializable_mixin import SerializableMixin
 
 
-@define(kw_only=True)
+@define
 class StructureTaskMemoryExtractionEngineConfig(SerializableMixin):
     csv: StructureTaskMemoryExtractionEngineCsvConfig = field(
-        default=Factory(lambda: StructureTaskMemoryExtractionEngineCsvConfig()), metadata={"serializable": True}
+        kw_only=True,
+        default=Factory(lambda: StructureTaskMemoryExtractionEngineCsvConfig()),
+        metadata={"serializable": True},
     )
     json: StructureTaskMemoryExtractionEngineJsonConfig = field(
-        default=Factory(lambda: StructureTaskMemoryExtractionEngineJsonConfig()), metadata={"serializable": True}
+        kw_only=True,
+        default=Factory(lambda: StructureTaskMemoryExtractionEngineJsonConfig()),
+        metadata={"serializable": True},
     )
diff --git a/griptape/config/structure_task_memory_extraction_engine_csv_config.py b/griptape/config/structure_task_memory_extraction_engine_csv_config.py
@@ -4,6 +4,8 @@
 from griptape.mixins.serializable_mixin import SerializableMixin
 
 
-@define(kw_only=True)
+@define
 class StructureTaskMemoryExtractionEngineCsvConfig(SerializableMixin):
-    prompt_driver: BasePromptDriver = field(default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True})
+    prompt_driver: BasePromptDriver = field(
+        kw_only=True, default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True}
+    )
diff --git a/griptape/config/structure_task_memory_extraction_engine_json_config.py b/griptape/config/structure_task_memory_extraction_engine_json_config.py
@@ -4,6 +4,8 @@
 from griptape.mixins.serializable_mixin import SerializableMixin
 
 
-@define(kw_only=True)
+@define
 class StructureTaskMemoryExtractionEngineJsonConfig(SerializableMixin):
-    prompt_driver: BasePromptDriver = field(default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True})
+    prompt_driver: BasePromptDriver = field(
+        kw_only=True, default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True}
+    )
diff --git a/griptape/config/structure_task_memory_query_engine_config.py b/griptape/config/structure_task_memory_query_engine_config.py
@@ -10,10 +10,13 @@
 from griptape.mixins.serializable_mixin import SerializableMixin
 
 
-@define(kw_only=True)
+@define
 class StructureTaskMemoryQueryEngineConfig(SerializableMixin):
-    prompt_driver: BasePromptDriver = field(default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True})
+    prompt_driver: BasePromptDriver = field(
+        kw_only=True, default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True}
+    )
     vector_store_driver: BaseVectorStoreDriver = field(
+        kw_only=True,
         default=Factory(lambda: NopVectorStoreDriver(embedding_driver=NopEmbeddingDriver())),
         metadata={"serializable": True},
     )
diff --git a/griptape/config/structure_task_memory_summary_engine_config.py b/griptape/config/structure_task_memory_summary_engine_config.py
@@ -1,9 +1,11 @@
-from attrs import define, field, Factory
+from attrs import Factory, define, field
 
 from griptape.drivers import BasePromptDriver, NopPromptDriver
 from griptape.mixins.serializable_mixin import SerializableMixin
 
 
-@define(kw_only=True)
+@define
 class StructureTaskMemorySummaryEngineConfig(SerializableMixin):
-    prompt_driver: BasePromptDriver = field(default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True})
+    prompt_driver: BasePromptDriver = field(
+        kw_only=True, default=Factory(lambda: NopPromptDriver()), metadata={"serializable": True}
+    )
diff --git a/tests/mocks/mock_structure_config.py b/tests/mocks/mock_structure_config.py
@@ -15,7 +15,7 @@
 from tests.mocks.mock_embedding_driver import MockEmbeddingDriver
 
 
-@define(kw_only=True)
+@define
 class MockStructureConfig(BaseStructureConfig):
     global_drivers: StructureGlobalDriversConfig = field(
         default=Factory(