Merge pull request #137 from griptape-ai:dev

update to griptape v0.33.1
griptape-ai · Oct 11, 2024 · 3c8d335 · 3c8d335
2 parents 58f398c + 343166c
commit 3c8d335
Show file tree

Hide file tree

Showing 5 changed files with 149 additions and 146 deletions.
diff --git a/README.md b/README.md
@@ -103,6 +103,9 @@ You can previous and download more examples [here](examples/README.md).
 
 ## Recent Changelog
 
+### Oct 11, 2024
+* Updated to Griptape Framework v0.33.1 to resolve install bugs
+
 ### Oct 10, 2024
 * Updated to Griptape Framework v0.33
 * Added `TavilyWebSearchDriver`. Requires a Tavily [api key](https://app.tavily.com/).

diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.11"
 python-dotenv = "^1.0.1"
-griptape = { version = "^0.33.0", extras = ["drivers-web-search-tavily","drivers-web-search-exa","drivers-image-generation-huggingface","drivers-prompt-cohere","drivers-prompt-anthropic","drivers-prompt-huggingface-hub","drivers-prompt-amazon-bedrock","drivers-prompt-amazon-sagemaker","drivers-prompt-google","drivers-prompt-ollama","drivers-embedding-amazon-bedrock","drivers-embedding-amazon-sagemaker","drivers-embedding-huggingface","drivers-embedding-voyageai","drivers-embedding-google","drivers-embedding-cohere","drivers-embedding-ollama","drivers-vector-pinecone","drivers-vector-marqo","drivers-vector-mongodb","drivers-vector-redis","drivers-vector-opensearch","drivers-vector-pgvector","drivers-vector-postgresql","drivers-vector-qdrant","drivers-web-scraper-trafilatura","drivers-web-scraper-markdownify","drivers-web-search-duckduckgo","loaders-pdf","loaders-image","drivers-text-to-speech-elevenlabs"]}
+griptape = { version = "^0.33.1", extras = ["all"]}
 
 [tool.poetry.group.dev.dependencies]
 icecream = "^2.1.3"
@@ -26,9 +26,9 @@ priority = "explicit"
 [project]
 name = "comfyui-griptape"
 description = "Griptape LLM(Large Language Model) Nodes for ComfyUI."
-version = "1.0.7"
+version = "1.0.8"
 license = {file = "LICENSE"}
-dependencies = ["griptape[drivers-web-search-tavily,drivers-web-search-exa,drivers-prompt-cohere,drivers-prompt-anthropic,drivers-prompt-huggingface-hub,drivers-prompt-amazon-bedrock,drivers-prompt-amazon-sagemaker,drivers-prompt-google,drivers-prompt-ollama,drivers-embedding-amazon-bedrock,drivers-embedding-amazon-sagemaker,drivers-embedding-huggingface,drivers-embedding-voyageai,drivers-embedding-google,drivers-embedding-cohere,drivers-text-to-speech-elevenlabs,drivers-vector-pinecone,drivers-vector-marqo,drivers-vector-mongodb,drivers-vector-redis,drivers-vector-opensearch,drivers-vector-pgvector,drivers-vector-qdrant,drivers-web-scraper-trafilatura,drivers-web-scraper-markdownify,drivers-web-search-duckduckgo,loaders-pdf,loaders-image]==0.33.0", "python-dotenv"]
+dependencies = ["griptape[all]==0.33.1", "python-dotenv"]
 
 [project.urls]
 Repository = "https://github.com/griptape-ai/ComfyUI-Griptape"

diff --git a/requirements.txt b/requirements.txt
@@ -1,141 +1,2 @@
-aiohappyeyeballs==2.4.3 ; python_version >= "3.11" and python_version < "4.0"
-aiohttp==3.10.10 ; python_version >= "3.11" and python_version < "4.0"
-aiolimiter==1.1.0 ; python_version >= "3.11" and python_version < "4.0"
-aiosignal==1.3.1 ; python_version >= "3.11" and python_version < "4.0"
-annotated-types==0.7.0 ; python_version >= "3.11" and python_version < "4.0"
-anthropic==0.35.0 ; python_version >= "3.11" and python_version < "4.0"
-anyio==4.6.0 ; python_version >= "3.11" and python_version < "4.0"
-async-timeout==4.0.3 ; python_version >= "3.11" and python_full_version < "3.11.3"
-attrs==24.2.0 ; python_version >= "3.11" and python_version < "4.0"
-babel==2.16.0 ; python_version >= "3.11" and python_version < "4.0"
-beautifulsoup4==4.12.3 ; python_version >= "3.11" and python_version < "4.0"
-boto3==1.35.38 ; python_version >= "3.11" and python_version < "4.0"
-botocore==1.35.38 ; python_version >= "3.11" and python_version < "4.0"
-cachetools==5.5.0 ; python_version >= "3.11" and python_version < "4.0"
-certifi==2024.8.30 ; python_version >= "3.11" and python_version < "4"
-charset-normalizer==3.4.0 ; python_version >= "3.11" and python_version < "4.0"
-click==8.1.7 ; python_version >= "3.11" and python_version < "4.0"
-cohere==5.10.0 ; python_version >= "3.11" and python_version < "4.0"
-colorama==0.4.6 ; python_version >= "3.11" and python_version < "4.0" and platform_system == "Windows"
-courlan==1.3.1 ; python_version >= "3.11" and python_version < "4.0"
-dateparser==1.2.0 ; python_version >= "3.11" and python_version < "4.0"
-diffusers==0.30.3 ; python_version >= "3.11" and python_version < "4.0"
-distro==1.9.0 ; python_version >= "3.11" and python_version < "4.0"
-dnspython==2.7.0 ; python_version >= "3.11" and python_version < "4.0"
-docker==7.1.0 ; python_version >= "3.11" and python_version < "4.0"
-duckduckgo-search==6.3.0 ; python_version >= "3.11" and python_version < "4.0"
-elevenlabs==1.9.0 ; python_version >= "3.11" and python_version < "4.0"
-events==0.5 ; python_version >= "3.11" and python_version < "4"
-exa-py==1.4.0 ; python_version >= "3.11" and python_version < "4.0"
-fastavro==1.9.7 ; python_version >= "3.11" and python_version < "4.0"
-filelock==3.16.1 ; python_version >= "3.11" and python_version < "4.0"
-filetype==1.2.0 ; python_version >= "3.11" and python_version < "4.0"
-frozenlist==1.4.1 ; python_version >= "3.11" and python_version < "4.0"
-fsspec==2024.9.0 ; python_version >= "3.11" and python_version < "4.0"
-google-ai-generativelanguage==0.6.10 ; python_version >= "3.11" and python_version < "4.0"
-google-api-core==2.21.0 ; python_version >= "3.11" and python_version < "4.0"
-google-api-core[grpc]==2.21.0 ; python_version >= "3.11" and python_version < "4.0"
-google-api-python-client==2.149.0 ; python_version >= "3.11" and python_version < "4.0"
-google-auth-httplib2==0.2.0 ; python_version >= "3.11" and python_version < "4.0"
-google-auth==2.35.0 ; python_version >= "3.11" and python_version < "4.0"
-google-generativeai==0.8.3 ; python_version >= "3.11" and python_version < "4.0"
-googleapis-common-protos==1.65.0 ; python_version >= "3.11" and python_version < "4.0"
-greenlet==3.0.3 ; python_version >= "3.11" and python_version < "4.0"
-griptape[drivers-embedding-amazon-bedrock,drivers-embedding-amazon-sagemaker,drivers-embedding-cohere,drivers-embedding-google,drivers-embedding-huggingface,drivers-embedding-ollama,drivers-embedding-voyageai,drivers-image-generation-huggingface,drivers-prompt-amazon-bedrock,drivers-prompt-amazon-sagemaker,drivers-prompt-anthropic,drivers-prompt-cohere,drivers-prompt-google,drivers-prompt-huggingface-hub,drivers-prompt-ollama,drivers-text-to-speech-elevenlabs,drivers-vector-marqo,drivers-vector-mongodb,drivers-vector-opensearch,drivers-vector-pgvector,drivers-vector-pinecone,drivers-vector-postgresql,drivers-vector-qdrant,drivers-vector-redis,drivers-web-scraper-markdownify,drivers-web-scraper-trafilatura,drivers-web-search-duckduckgo,drivers-web-search-exa,drivers-web-search-tavily,loaders-email,loaders-image,loaders-pdf]==0.33.0 ; python_version >= "3.11" and python_version < "4.0"
-grpcio-status==1.66.2 ; python_version >= "3.11" and python_version < "4.0"
-grpcio-tools==1.66.2 ; python_version >= "3.11" and python_version < "4.0"
-grpcio==1.66.2 ; python_version >= "3.11" and python_version < "4.0"
-h11==0.14.0 ; python_version >= "3.11" and python_version < "4.0"
-h2==4.1.0 ; python_version >= "3.11" and python_version < "4.0"
-hpack==4.0.0 ; python_version >= "3.11" and python_version < "4.0"
-htmldate==1.9.1 ; python_version >= "3.11" and python_version < "4.0"
-httpcore==1.0.6 ; python_version >= "3.11" and python_version < "4.0"
-httplib2==0.22.0 ; python_version >= "3.11" and python_version < "4.0"
-httpx-sse==0.4.0 ; python_version >= "3.11" and python_version < "4.0"
-httpx==0.27.2 ; python_version >= "3.11" and python_version < "4.0"
-httpx[http2]==0.27.2 ; python_version >= "3.11" and python_version < "4.0"
-huggingface-hub==0.25.2 ; python_version >= "3.11" and python_version < "4.0"
-hyperframe==6.0.1 ; python_version >= "3.11" and python_version < "4.0"
-idna==3.10 ; python_version >= "3.11" and python_version < "4.0"
-importlib-metadata==8.5.0 ; python_version >= "3.11" and python_version < "4.0"
-jinja2==3.1.4 ; python_version >= "3.11" and python_version < "4.0"
-jiter==0.6.1 ; python_version >= "3.11" and python_version < "4.0"
-jmespath==1.0.1 ; python_version >= "3.11" and python_version < "4.0"
-justext==3.0.1 ; python_version >= "3.11" and python_version < "4.0"
-lxml-html-clean==0.3.1 ; python_version >= "3.11" and python_version < "4.0"
-lxml==5.3.0 ; python_version >= "3.11" and python_version < "4.0"
-lxml[html-clean]==5.3.0 ; python_version >= "3.11" and python_version < "4.0"
-mail-parser==3.15.0 ; python_version >= "3.11" and python_version < "4.0"
-markdown-it-py==3.0.0 ; python_version >= "3.11" and python_version < "4.0"
-markdownify==0.13.1 ; python_version >= "3.11" and python_version < "4.0"
-markupsafe==3.0.1 ; python_version >= "3.11" and python_version < "4.0"
-marqo==3.8.1 ; python_version >= "3.11" and python_version < "4.0"
-marshmallow-enum==1.5.1 ; python_version >= "3.11" and python_version < "4.0"
-marshmallow==3.22.0 ; python_version >= "3.11" and python_version < "4.0"
-mdurl==0.1.2 ; python_version >= "3.11" and python_version < "4.0"
-multidict==6.1.0 ; python_version >= "3.11" and python_version < "4.0"
-numpy==1.26.4 ; python_version >= "3.11" and python_version < "4.0"
-ollama==0.3.3 ; python_version >= "3.11" and python_version < "4.0"
-openai==1.51.2 ; python_version >= "3.11" and python_version < "4.0"
-opensearch-py==2.7.1 ; python_version >= "3.11" and python_version < "4"
-packaging==24.1 ; python_version >= "3.11" and python_version < "4.0"
-parameterized==0.9.0 ; python_version >= "3.11" and python_version < "4.0"
-pgvector==0.3.5 ; python_version >= "3.11" and python_version < "4.0"
-pillow==10.4.0 ; python_version >= "3.11" and python_version < "4.0"
-pinecone-client==3.2.2 ; python_version >= "3.11" and python_version < "4.0"
-playwright==1.47.0 ; python_version >= "3.11" and python_version < "4.0"
-portalocker==2.10.1 ; python_version >= "3.11" and python_version < "4.0"
-primp==0.6.3 ; python_version >= "3.11" and python_version < "4.0"
-propcache==0.2.0 ; python_version >= "3.11" and python_version < "4.0"
-proto-plus==1.24.0 ; python_version >= "3.11" and python_version < "4.0"
-protobuf==5.28.2 ; python_version >= "3.11" and python_version < "4.0"
-psycopg2-binary==2.9.9 ; python_version >= "3.11" and python_version < "4.0"
-pyasn1-modules==0.4.1 ; python_version >= "3.11" and python_version < "4.0"
-pyasn1==0.6.1 ; python_version >= "3.11" and python_version < "4.0"
-pydantic-core==2.23.4 ; python_version >= "3.11" and python_version < "4.0"
-pydantic==2.9.2 ; python_version >= "3.11" and python_version < "4.0"
-pyee==12.0.0 ; python_version >= "3.11" and python_version < "4.0"
-pygments==2.18.0 ; python_version >= "3.11" and python_version < "4.0"
-pymongo==4.10.1 ; python_version >= "3.11" and python_version < "4.0"
-pyparsing==3.1.4 ; python_version >= "3.11" and python_version < "4.0"
-pypdf==5.0.1 ; python_version >= "3.11" and python_version < "4.0"
-python-dateutil==2.9.0.post0 ; python_version >= "3.11" and python_version < "4"
-python-dotenv==1.0.1 ; python_version >= "3.11" and python_version < "4.0"
-pytz==2024.2 ; python_version >= "3.11" and python_version < "4.0"
-pywin32==307 ; python_version >= "3.11" and python_version < "4.0" and (sys_platform == "win32" or platform_system == "Windows")
-pyyaml==6.0.2 ; python_version >= "3.11" and python_version < "4.0"
-qdrant-client==1.12.0 ; python_version >= "3.11" and python_version < "4.0"
-redis==5.1.1 ; python_version >= "3.11" and python_version < "4.0"
-regex==2024.9.11 ; python_version >= "3.11" and python_version < "4.0"
-requests==2.32.3 ; python_version >= "3.11" and python_version < "4.0"
-rich==13.9.2 ; python_version >= "3.11" and python_version < "4.0"
-rsa==4.9 ; python_version >= "3.11" and python_version < "4"
-s3transfer==0.10.3 ; python_version >= "3.11" and python_version < "4.0"
-safetensors==0.4.5 ; python_version >= "3.11" and python_version < "4.0"
-schema==0.7.7 ; python_version >= "3.11" and python_version < "4.0"
-setuptools==75.1.0 ; python_version >= "3.11" and python_version < "4.0"
-simplejson==3.19.3 ; python_version >= "3.11" and python_version < "4.0"
-six==1.16.0 ; python_version >= "3.11" and python_version < "4.0"
-sniffio==1.3.1 ; python_version >= "3.11" and python_version < "4.0"
-soupsieve==2.6 ; python_version >= "3.11" and python_version < "4.0"
-sqlalchemy==2.0.35 ; python_version >= "3.11" and python_version < "4.0"
-stringcase==1.2.0 ; python_version >= "3.11" and python_version < "4.0"
-tavily-python==0.5.0 ; python_version >= "3.11" and python_version < "4.0"
-tenacity==8.5.0 ; python_version >= "3.11" and python_version < "4.0"
-tiktoken==0.8.0 ; python_version >= "3.11" and python_version < "4.0"
-tld==0.13 ; python_version >= "3.11" and python_version < "4"
-tokenizers==0.20.1 ; python_version >= "3.11" and python_version < "4.0"
-tqdm==4.66.5 ; python_version >= "3.11" and python_version < "4.0"
-trafilatura==1.12.2 ; python_version >= "3.11" and python_version < "4.0"
-transformers==4.45.2 ; python_version >= "3.11" and python_version < "4.0"
-types-requests==2.31.0.6 ; python_version >= "3.11" and python_version < "4.0"
-types-urllib3==1.26.25.14 ; python_version >= "3.11" and python_version < "4.0"
-typing-extensions==4.12.2 ; python_version >= "3.11" and python_version < "4.0"
-tzdata==2024.2 ; python_version >= "3.11" and python_version < "4.0" and platform_system == "Windows"
-tzlocal==5.2 ; python_version >= "3.11" and python_version < "4.0"
-uritemplate==4.1.1 ; python_version >= "3.11" and python_version < "4.0"
-urllib3==1.26.20 ; python_version >= "3.11" and python_version < "4.0"
-voyageai==0.2.3 ; python_version >= "3.11" and python_version < "4.0"
-websockets==13.1 ; python_version >= "3.11" and python_version < "4.0"
-yarl==1.14.0 ; python_version >= "3.11" and python_version < "4.0"
-zipp==3.20.2 ; python_version >= "3.11" and python_version < "4.0"
+griptape[all]==0.33.1
+python-dotenv
diff --git a/requirements_old.txt b/requirements_old.txt