Skip to content

Commit

Permalink
Merge pull request #142 from griptape-ai:dev
Browse files Browse the repository at this point in the history
Update pyproject.toml
  • Loading branch information
shhlife authored Oct 29, 2024
2 parents e9268c7 + 6f7636c commit 65e55c7
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 22 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ You can previous and download more examples [here](examples/README.md).

## Recent Changelog

### Oct 30, 2024
* Updated to Griptape Framework v0.34.0
* **Breaking Changes**
* `AnthropicDriversConfig` node no longer includes Embedding Driver. If you wish to use Claude within a RAG pipeline, build a `Config: Custom Structure` using a Prompt Driver, Embedding Driver, and Vector Store Driver. See the attached image for an example:

![alt text](docs/images/anthropic_custom_structure.png)

### Oct 23, 2024
* Updated Anthropic Claude Prompt Driver to include `claude-3-5-sonnet-20241022`
* Updated Anthropic Claude Config to offer option to not use Voyage API for Embedding Driver. Just set `ignore_voyage_embedding_driver` to `True`
Expand Down
Binary file added docs/images/anthropic_custom_structure.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 9 additions & 2 deletions js/versions.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
export const versions = {
"version": "0.33.1",
"releaseDate": "2024-10-11",
"version": "0.34.0",
"releaseDate": "2024-10-30",
"name": "ComfyUI-Griptape",
"description": "Griptape integration for ComfyUI",
"author": "Jason Schleifer",
"repository": "https://github.com/griptape-ai/ComfyUI-Griptape",
"changelog": [
{
"version": "0.34.0",
"date": "2024-10-30",
"changes": [
"Update to Griptape v0.34.0",
]
},
{
"version": "0.33.1",
"date": "2024-10-23",
Expand Down
28 changes: 12 additions & 16 deletions nodes/config/gtUIAnthropicDriversConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@
# StructureGlobalDriversConfig,
from griptape.drivers import (
AnthropicPromptDriver,
DummyEmbeddingDriver,
LocalVectorStoreDriver,
VoyageAiEmbeddingDriver,
)

from ..drivers.gtUIAnthropicPromptDriver import gtUIAnthropicPromptDriver
from ..drivers.gtUIVoyageAiEmbeddingDriver import gtUIVoyageAiEmbeddingDriver
from .gtUIBaseDriversConfig import (
add_optional_inputs,
add_required_inputs,
Expand All @@ -30,7 +26,7 @@
# Define the list of drivers
drivers = [
("prompt", gtUIAnthropicPromptDriver),
("embedding", gtUIVoyageAiEmbeddingDriver),
# ("embedding", gtUIVoyageAiEmbeddingDriver),
]


Expand Down Expand Up @@ -62,27 +58,27 @@ def create(

# Create instances of the driver classes
prompt_driver_builder = gtUIAnthropicPromptDriver()
embedding_driver_builder = gtUIVoyageAiEmbeddingDriver()
# embedding_driver_builder = gtUIVoyageAiEmbeddingDriver()

# Build parameters for drivers
prompt_driver_params = prompt_driver_builder.build_params(**kwargs)
embedding_driver_params = embedding_driver_builder.build_params(**kwargs)
# embedding_driver_params = embedding_driver_builder.build_params(**kwargs)

# Create Driver Configs
drivers_config_params["prompt_driver"] = AnthropicPromptDriver(
**prompt_driver_params
)

if embedding_driver_params == {}:
drivers_config_params["embedding_driver"] = VoyageAiEmbeddingDriver(
**embedding_driver_params
)
else:
drivers_config_params["embedding_driver"] = DummyEmbeddingDriver()
# if embedding_driver_params == {}:
# drivers_config_params["embedding_driver"] = VoyageAiEmbeddingDriver(
# **embedding_driver_params
# )
# else:
# drivers_config_params["embedding_driver"] = DummyEmbeddingDriver()

drivers_config_params["vector_store_driver"] = LocalVectorStoreDriver(
embedding_driver=drivers_config_params["embedding_driver"]
)
# drivers_config_params["vector_store_driver"] = LocalVectorStoreDriver(
# embedding_driver=drivers_config_params["embedding_driver"]
# )

try:
Defaults.drivers_config = AnthropicDriversConfig(**drivers_config_params)
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readme = "README.md"
[tool.poetry.dependencies]
python = "^3.11"
python-dotenv = "^1.0.1"
griptape = { version = "^0.33.1", extras = ["all"]}
griptape = { version = "^0.34.0", extras = ["all"]}

[tool.poetry.group.dev.dependencies]
icecream = "^2.1.3"
Expand All @@ -26,9 +26,9 @@ priority = "explicit"
[project]
name = "comfyui-griptape"
description = "Griptape LLM(Large Language Model) Nodes for ComfyUI."
version = "1.0.9"
version = "1.0.10"
license = {file = "LICENSE"}
dependencies = ["griptape[all]==0.33.1", "python-dotenv"]
dependencies = ["griptape[all]==0.34.0", "python-dotenv"]

[project.urls]
Repository = "https://github.com/griptape-ai/ComfyUI-Griptape"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
griptape[all]==0.33.1
griptape[all]==0.34.0
python-dotenv

0 comments on commit 65e55c7

Please sign in to comment.