Merge pull request #167 from griptape-ai/dev

Dev

README.md

@@ -104,6 +104,37 @@ You can previous and download more examples [here](examples/README.md).
 
 ## Recent Changelog
 
+### Nov 26, 2024
+* Upgrade to Griptape Framework v0.34.3
+* New Nodes:
+  * `Griptape Driver: Black Forest Labs Image Generation` - Now generate images with the incredible Flux models - `flux-pro-1.1`, `flux-pro`, `flux-dev`, and `flux-pro-1.1-ultra`. 
+    - Requires an API_KEY from Black Forest Labs (https://docs.bfl.ml/)
+    - Utilizes new Griptape Extension: https://github.com/griptape-ai/griptape-black-forest
+
+  ![Black Forest Labs - Create Image](examples/griptape_black_forest_labs_create_image.png)
+
+    - It also works with the `Griptape Create: Image Variation` node.
+
+    ![Black Forest Labs - Image Variation](examples/griptape_black_forest_labs_create_variation.png)
+
+  * `Griptape Create: Image Inpainting Variation` to the Griptape -> Image menu. Gives the ability to paint a mask and replace that part of the image.
+
+  ![Black Forest Labs - Inpainting](examples/griptape_black_forest_flux_inpainting.png)
+
+  * `Griptape Run: Task` - Combines/Replaces `Griptape Run: Prompt Task`, `Griptape Run: Tool Task`, and `Griptape Run Toolkit Task` into a single node that knows what to do.
+  * `Griptape Run: Text Extraction` to the Griptape -> Text menu
+* Added `keep_alive` parameter to `Ollama Prompt Driver` to give the user the ability to control how long to keep the model running. Setting it to 0 will do the same as an `ollama stop <model>` command-line execution. Default setting is 240 seconds to match the current default.
+
+* Moved node: `Griptape Run: Text Summary` to the Griptape -> Text menu
+* Updated `Griptape RAG Retrieve: Text Loader Module` to take a file input or text input.
+* Fixed ExtractionTool to use a default of `gpt-4o-mini`
+* Added some text files for testing text loading
+* Added Examples to [Examples Readme](examples/README.md)
+  * [Render Log Review](examples/render_log_review.png)
+  * [Flux Pro 1.1 Image Generation](examples/griptape_black_forest_labs_create_image.png)
+  * [Flux Pro 1.0-Canny Image Variation](examples/griptape_black_forest_labs_create_variation.png)
+  * [Flux Pro 1.0-Fill Image InPainting](examples/griptape_black_forest_flux_inpainting.png)
+
 ### Nov 9, 2024
 * Upgrade to Griptape Framework v0.34.2
 * Fixed combine nodes breaking when re-connecting output

__init__.py

@@ -118,6 +118,11 @@
     gtUIAzureOpenAiImageGenerationDriver,
 )
 
+# - BlackForest Labs
+from .nodes.drivers.gtUIBlackForestImageGenerationDriver import (
+    gtUIBlackForestImageGenerationDriver,
+)
+
 # - Cohere
 from .nodes.drivers.gtUICohereEmbeddingDriver import gtUICohereEmbeddingDriver
 from .nodes.drivers.gtUICoherePromptDriver import gtUICoherePromptDriver
@@ -236,17 +241,24 @@
 # RULES
 from .nodes.rules.gtUIRule import gtUIRule
 
-# TASKS
 # - Audio
 from .nodes.tasks.gtUIAudioTranscriptionTask import gtUIAudioTranscriptionTask
+from .nodes.tasks.gtUIExtractionTask import gtUIExtractionTask
 
 # - Image
 from .nodes.tasks.gtUIImageQueryTask import gtUIImageQueryTask
+from .nodes.tasks.gtUIInpaintingImageGenerationTask import (
+    gtUIInpaintingImageGenerationTask,
+)
 from .nodes.tasks.gtUIParallelImageQueryTask import gtUIParallelImageQueryTask
 from .nodes.tasks.gtUIPromptImageGenerationTask import gtUIPromptImageGenerationTask
 from .nodes.tasks.gtUIPromptImageVariationTask import gtUIPromptImageVariationTask
 from .nodes.tasks.gtUIPromptTask import gtUIPromptTask
 
+# TASKS
+# - Agent
+from .nodes.tasks.gtUITask import gtUITask
+
 # - Text
 from .nodes.tasks.gtUITextSummaryTask import gtUITextSummaryTask
 from .nodes.tasks.gtUITextToSpeechTask import gtUITextToSpeechTask
@@ -317,10 +329,10 @@
     "Griptape Create: Agent": CreateAgent,
     "Griptape Create: Agent from Config": gtUICreateAgentFromConfig,
     "Griptape Run: Agent": RunAgent,
-    "Griptape Run: Prompt Task": gtUIPromptTask,
-    "Griptape Run: Text Summary": gtUITextSummaryTask,
-    "Griptape Run: Tool Task": gtUIToolTask,
-    "Griptape Run: Toolkit Task": gtUIToolkitTask,
+    "Griptape Run: Task": gtUITask,
+    # "Griptape Run: Prompt Task": gtUIPromptTask,
+    # "Griptape Run: Tool Task": gtUIToolTask,
+    # "Griptape Run: Toolkit Task": gtUIToolkitTask,
     # "Gt Run Agent": gtUIRunAgent,
     "Griptape Expand: Agent Nodes": ExpandAgent,
     "Griptape Set: Default Agent": gtUISetDefaultAgent,
@@ -364,6 +376,7 @@
     "Griptape Driver: Amazon Bedrock Stable Diffusion": gtUIAmazonBedrockStableDiffusionImageGenerationDriver,
     "Griptape Driver: Amazon Bedrock Titan": gtUIAmazonBedrockTitanImageGenerationDriver,
     "Griptape Driver: Azure OpenAI Image Generation": gtUIAzureOpenAiImageGenerationDriver,
+    "Griptape Driver: Black Forest Labs Image Generation": gtUIBlackForestImageGenerationDriver,
     "Griptape Driver: Leonardo.AI": gtUILeonardoImageGenerationDriver,
     "Griptape Driver: OpenAI Image Generation": gtUIOpenAiImageGenerationDriver,
     "Griptape Driver: OpenAI Compatible Image Generation": gtUIOpenAiCompatibleImageGenerationDriver,
@@ -444,6 +457,7 @@
     # Image
     "Griptape Create: Image from Text": gtUIPromptImageGenerationTask,
     "Griptape Create: Image Variation": gtUIPromptImageVariationTask,
+    "Griptape Create: Image Inpainting Variation": gtUIInpaintingImageGenerationTask,
     "Griptape Run: Image Description": gtUIImageQueryTask,
     "Griptape Run: Parallel Image Description": gtUIParallelImageQueryTask,
     "Griptape Load: Image From URL": gtUIFetchImage,
@@ -456,6 +470,8 @@
     "Griptape Combine: Merge Inputs": gtUIMergeInputs,
     "Griptape Load: Text": gtUILoadText,
     "Griptape Save: Text": gtUISaveText,
+    "Griptape Run: Text Extraction": gtUIExtractionTask,
+    "Griptape Run: Text Summary": gtUITextSummaryTask,
     "Griptape Vector Store: Add Text": gtUIVectorStoreUpsertTextTask,
     "Griptape Vector Store: Query": gtUIVectorStoreQueryTask,
     # "Griptape Display: Artifact": gtUIOutputArtifactNode,