added threads

app.py

@@ -1,7 +1,9 @@
 import glob
+from venv import create
 import gradio as gr
 from typing import Any
 from dotenv import load_dotenv
+import requests
 from griptape.structures import Agent
 from griptape.tasks import PromptTask
 from griptape.drivers import (
@@ -9,19 +11,49 @@ from griptape.drivers import (
     GriptapeCloudStructureRunDriver,
     LocalFileManagerDriver,
     LocalStructureRunDriver,
+    GriptapeCloudConversationMemoryDriver,
 )
 from griptape.memory.structure import ConversationMemory
-from griptape.tools import StructureRunClient, FileManager
+from griptape.tools import StructureRunTool, FileManagerTool
 from griptape.rules import Rule, Ruleset
-from griptape.config import AnthropicStructureConfig
+from griptape.configs.drivers import AnthropicDriversConfig
+from griptape.configs import Defaults
 import time
 import os
-import re
+from urllib.parse import urljoin
 
 
 # Load environment variables
 load_dotenv()
 
+Defaults.drivers_config = AnthropicDriversConfig()
+
+base_url = "https://cloud.griptape.ai"
+
+headers_api = {
+    "Authorization": f"Bearer {os.environ['GT_CLOUD_API_KEY']}",
+    "Content-Type": "application/json",
+}
+
+threads = {}
+
+
+def create_thread_id(session_id: str) -> str:
+    if not session_id in threads:
+        params = {
+            "name": session_id,
+            "messages": [],
+        }
+        response = requests.post(
+            url=urljoin(base_url, "/api/threads"), headers=headers_api, json=params
+        )
+        response.raise_for_status()
+        thread_id = response.json()["thread_id"]
+        threads[session_id] = thread_id
+        return thread_id
+    else:
+        return threads[session_id]
+
 
 # Create an agent that will create a prompt that can be used as input for the query agent from the Griptape Cloud.
 
@@ -49,7 +81,7 @@ def bot(history):
 def create_prompt_task(session_id: str, message: str) -> PromptTask:
     return PromptTask(
         f"""
-            Re-structure the values from the user's questions: '{message}' and the input value from the conversation memory '{session_id}.json' to fit the following format. Leave out attributes that aren't important to the user: 
+            Re-structure the values from the user's questions: '{message}' and the input value from the conversation memory to fit the following format. Leave out attributes that aren't important to the user: 
                 years experience: <x>
                 location: <x>
                 role: <x>
@@ -64,6 +96,9 @@ def create_prompt_task(session_id: str, message: str) -> PromptTask:
 
 
 def build_talk_agent(session_id: str, message: str) -> Agent:
+
+    create_thread_id(session_id)
+
     ruleset = Ruleset(
         name="Local Gradio Agent",
         rules=[
@@ -81,16 +116,17 @@ def build_talk_agent(session_id: str, message: str) -> Agent:
             ),
         ],
     )
-    file_manager_tool = FileManager(
+    file_manager_tool = FileManagerTool(
         name="FileManager",
         file_manager_driver=LocalFileManagerDriver(),
         off_prompt=False,
     )
 
     return Agent(
-        config=AnthropicStructureConfig(),
         conversation_memory=ConversationMemory(
-            driver=LocalConversationMemoryDriver(file_path=f"{session_id}.json")
+            driver=GriptapeCloudConversationMemoryDriver(
+                thread_id=str(threads[session_id]),
+            )
         ),
         tools=[file_manager_tool],
         tasks=[create_prompt_task(session_id, message)],
@@ -102,6 +138,8 @@ def build_talk_agent(session_id: str, message: str) -> Agent:
 # The agent uses local memory, which it differentiates between by session_hash.
 def build_agent(session_id: str, message: str) -> Agent:
 
+    create_thread_id(session_id)
+
     ruleset = Ruleset(
         name="Local Gradio Agent",
         rules=[
@@ -129,7 +167,7 @@ def build_agent(session_id: str, message: str) -> Agent:
 
     print("Base URL", os.environ.get("BASE_URL", "https://cloud.griptape.ai"))
 
-    query_client = StructureRunClient(
+    query_client = StructureRunTool(
         name="QueryResumeSearcher",
         description="Use it to search for a candidate with the query.",
         driver=GriptapeCloudStructureRunDriver(
@@ -141,7 +179,7 @@ def build_agent(session_id: str, message: str) -> Agent:
         ),
     )
 
-    talk_client = StructureRunClient(
+    talk_client = StructureRunTool(
         name="FormulateQueryFromUser",
         description="Used to formulate a query from the user's input.",
         driver=LocalStructureRunDriver(
@@ -150,29 +188,27 @@ def build_agent(session_id: str, message: str) -> Agent:
     )
 
     return Agent(
-        config=AnthropicStructureConfig(),
         conversation_memory=ConversationMemory(
-            driver=LocalConversationMemoryDriver(file_path=f"{session_id}.json")
+            driver=GriptapeCloudConversationMemoryDriver(
+                thread_id=threads[session_id],
+            )
         ),
         tools=[talk_client, query_client],
         rulesets=[ruleset],
     )
 
 
-def delete_json(session_id: str) -> None:
-    for file in glob.glob(f"{session_id}.json"):
-        os.remove(file)
-
-
 def send_message(message: str, history, request: gr.Request) -> Any:
     if request:
         session_hash = request.session_hash
         agent = build_agent(session_hash, message)
     response = agent.run(message)
-    # if re.search(r'\bdone[.,!?]?\b', message, re.IGNORECASE):
-    # delete_json(session_hash)
     return response.output.value
 
 
 demo = gr.ChatInterface(fn=send_message)
 demo.launch()
+
+# Set it back to empty when a session is done
+# Is there a better way?
+threads = {}

poetry.lock

@@ -212,22 +212,22 @@ files = [
 
 [[package]]
 name = "attrs"
-version = "23.2.0"
+version = "24.2.0"
 description = "Classes Without Boilerplate"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"},
-    {file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"},
+    {file = "attrs-24.2.0-py3-none-any.whl", hash = "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"},
+    {file = "attrs-24.2.0.tar.gz", hash = "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346"},
 ]
 
 [package.extras]
-cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
-dev = ["attrs[tests]", "pre-commit"]
-docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
-tests = ["attrs[tests-no-zope]", "zope-interface"]
-tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"]
-tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
+benchmark = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+cov = ["cloudpickle", "coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+dev = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+docs = ["cogapp", "furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
+tests = ["cloudpickle", "hypothesis", "mypy (>=1.11.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+tests-mypy = ["mypy (>=1.11.1)", "pytest-mypy-plugins"]
 
 [[package]]
 name = "azure-core"
@@ -982,35 +982,33 @@ websockets = ">=10.0,<12.0"
 
 [[package]]
 name = "griptape"
-version = "0.29.1"
+version = "0.30.1"
 description = "Modular Python framework for LLM workflows, tools, memory, and data."
 optional = false
-python-versions = "<4.0,>=3.9"
-files = [
-    {file = "griptape-0.29.1-py3-none-any.whl", hash = "sha256:ca10e57e2ab73ff8f177a3b0575f2c909e3e503e4ca1df113f9412fb9fba904b"},
-    {file = "griptape-0.29.1.tar.gz", hash = "sha256:9cea05fa198a6b5efb3d25bee024367fdf92a9452b02a7080e3216432849e2f4"},
-]
+python-versions = "^3.9"
+files = []
+develop = false
 
 [package.dependencies]
-anthropic = {version = ">=0.29.0,<0.30.0", optional = true, markers = "extra == \"drivers-prompt-anthropic\" or extra == \"drivers-prompt-amazon-bedrock\" or extra == \"all\""}
-attrs = ">=23.2.0,<24.0.0"
-docker = ">=7.1.0,<8.0.0"
-jinja2 = ">=3.1.4,<4.0.0"
-marshmallow = ">=3.21.3,<4.0.0"
-marshmallow-enum = ">=1.5.1,<2.0.0"
-numpy = ">=1.26.4,<2.0.0"
-openai = ">=1.1.1,<2.0.0"
-pyyaml = ">=6.0.1,<7.0.0"
-requests = ">=2.32.0,<3.0.0"
-rich = ">=13.7.1,<14.0.0"
-schema = ">=0.7.7,<0.8.0"
-stringcase = ">=1.2.0,<2.0.0"
-tenacity = ">=8.5.0,<9.0.0"
-tiktoken = ">=0.7,<0.8"
-voyageai = {version = ">=0.2.1,<0.3.0", optional = true, markers = "extra == \"drivers-embedding-voyageai\" or extra == \"all\""}
+anthropic = {version = "^0.29.0", optional = true}
+attrs = "^24.2.0"
+docker = "^7.1.0"
+jinja2 = "^3.1.4"
+marshmallow = "^3.21.3"
+marshmallow-enum = "^1.5.1"
+numpy = "^1.26.4"
+openai = "^1.1.1"
+pyyaml = "^6.0.1"
+requests = "^2.32.0"
+rich = "^13.7.1"
+schema = "^0.7.7"
+stringcase = "^1.2.0"
+tenacity = "^8.5.0"
+tiktoken = "^0.7"
+voyageai = {version = "^0.2.1", optional = true}
 
 [package.extras]
-all = ["accelerate (>=0.32.1,<0.33.0)", "anthropic (>=0.29.0,<0.30.0)", "beautifulsoup4 (>=4.12.3,<5.0.0)", "boto3 (>=1.34.119,<2.0.0)", "cohere (>=5.5.4,<6.0.0)", "diffusers (>=0.29.1,<0.30.0)", "duckduckgo-search (>=6.1.12,<7.0.0)", "elevenlabs (>=1.1.2,<2.0.0)", "filetype (>=1.2,<2.0)", "google-generativeai (>=0.7.2,<0.8.0)", "mail-parser (>=3.15.0,<4.0.0)", "markdownify (>=0.11.6,<0.12.0)", "marqo (>=3.7.0,<4.0.0)", "ollama (>=0.3.0,<0.4.0)", "opensearch-py (>=2.3.1,<3.0.0)", "opentelemetry-api (>=1.25.0,<2.0.0)", "opentelemetry-exporter-otlp-proto-http (>=1.25.0,<2.0.0)", "opentelemetry-instrumentation (>=0.46b0,<0.47)", "opentelemetry-instrumentation-threading (>=0.46b0,<0.47)", "opentelemetry-sdk (>=1.25.0,<2.0.0)", "pandas (>=1.3,<2.0)", "pgvector (>=0.2.3,<0.3.0)", "pillow (>=10.2.0,<11.0.0)", "pinecone-client (>=3,<4)", "playwright (>=1.42,<2.0)", "psycopg2-binary (>=2.9.9,<3.0.0)", "pusher (>=3.3.2,<4.0.0)", "pymongo (>=4.8.0,<5.0.0)", "pypdf (>=3.9,<4.0)", "qdrant-client (>=1.10.1,<2.0.0)", "redis (>=4.6.0,<5.0.0)", "sentencepiece (>=0.2.0,<0.3.0)", "snowflake-sqlalchemy (>=1.6.1,<2.0.0)", "sqlalchemy (>=2.0.31,<3.0.0)", "torch (>=2.3.1,<3.0.0)", "trafilatura (>=1.6,<2.0)", "transformers[torch] (>=4.41.1,<5.0.0)", "voyageai (>=0.2.1,<0.3.0)"]
+all = ["accelerate (>=0.32.1,<0.33.0)", "anthropic (>=0.29.0,<0.30.0)", "astrapy (>=1.4,<2.0)", "beautifulsoup4 (>=4.12.3,<5.0.0)", "boto3 (>=1.34.119,<2.0.0)", "cohere (>=5.5.4,<6.0.0)", "diffusers (>=0.29.1,<0.30.0)", "duckduckgo-search (>=6.1.12,<7.0.0)", "elevenlabs (>=1.1.2,<2.0.0)", "filetype (>=1.2,<2.0)", "google-generativeai (>=0.7.2,<0.8.0)", "mail-parser (>=3.15.0,<4.0.0)", "markdownify (>=0.11.6,<0.12.0)", "marqo (>=3.7.0,<4.0.0)", "ollama (>=0.3.0,<0.4.0)", "opensearch-py (>=2.3.1,<3.0.0)", "opentelemetry-api (>=1.25.0,<2.0.0)", "opentelemetry-exporter-otlp-proto-http (>=1.25.0,<2.0.0)", "opentelemetry-instrumentation (>=0.46b0,<0.47)", "opentelemetry-instrumentation-threading (>=0.46b0,<0.47)", "opentelemetry-sdk (>=1.25.0,<2.0.0)", "pandas (>=1.3,<2.0)", "pgvector (>=0.2.3,<0.3.0)", "pillow (>=10.2.0,<11.0.0)", "pinecone-client (>=3,<4)", "playwright (>=1.42,<2.0)", "psycopg2-binary (>=2.9.9,<3.0.0)", "pusher (>=3.3.2,<4.0.0)", "pymongo (>=4.8.0,<5.0.0)", "pypdf (>=3.9,<4.0)", "qdrant-client (>=1.10.1,<2.0.0)", "redis (>=4.6.0,<5.0.0)", "sentencepiece (>=0.2.0,<0.3.0)", "snowflake-sqlalchemy (>=1.6.1,<2.0.0)", "sqlalchemy (>=2.0.31,<3.0.0)", "torch (>=2.3.1,<3.0.0)", "trafilatura (>=1.6,<2.0)", "transformers[torch] (>=4.41.1,<5.0.0)", "voyageai (>=0.2.1,<0.3.0)"]
 drivers-embedding-amazon-bedrock = ["boto3 (>=1.34.119,<2.0.0)"]
 drivers-embedding-amazon-sagemaker = ["boto3 (>=1.34.119,<2.0.0)"]
 drivers-embedding-cohere = ["cohere (>=5.5.4,<6.0.0)"]
@@ -1041,6 +1039,7 @@ drivers-sql-amazon-redshift = ["boto3 (>=1.34.119,<2.0.0)"]
 drivers-sql-snowflake = ["snowflake-sqlalchemy (>=1.6.1,<2.0.0)", "sqlalchemy (>=2.0.31,<3.0.0)"]
 drivers-text-to-speech-elevenlabs = ["elevenlabs (>=1.1.2,<2.0.0)"]
 drivers-vector-amazon-opensearch = ["boto3 (>=1.34.119,<2.0.0)", "opensearch-py (>=2.3.1,<3.0.0)"]
+drivers-vector-astra-db = ["astrapy (>=1.4,<2.0)"]
 drivers-vector-marqo = ["marqo (>=3.7.0,<4.0.0)"]
 drivers-vector-mongodb = ["pymongo (>=4.8.0,<5.0.0)"]
 drivers-vector-opensearch = ["opensearch-py (>=2.3.1,<3.0.0)"]
@@ -1058,6 +1057,12 @@ loaders-image = ["pillow (>=10.2.0,<11.0.0)"]
 loaders-pdf = ["pypdf (>=3.9,<4.0)"]
 loaders-sql = ["sqlalchemy (>=2.0.31,<3.0.0)"]
 
+[package.source]
+type = "git"
+url = "https://github.com/griptape-ai/griptape"
+reference = "dev"
+resolved_reference = "489453eddb0bfeb026a754278b5d3cde546427bb"
+
 [[package]]
 name = "h11"
 version = "0.14.0"
@@ -3331,4 +3336,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "be2915a907a6193804a58bba582e6b5611f9b31dd9aa15425189c3fd7b327a54"
+content-hash = "8d3d5c66554c9d6f0095463ce6653da9aaa439f8637871c474489ac050ee9c49"

pyproject.toml

@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "griptape-chat"
+name = "griptape-test"
 version = "0.1.0"
 description = "Chat demo using the Griptape Framework and Gradio."
 authors = ["Griptape <[email protected]>"]
@@ -12,8 +12,8 @@ package-mode = false
 python = "^3.11"
 python-dotenv = "^1.0.0"
 gradio = "^4.37.1"
-griptape = {extras = ["drivers-embedding-voyageai","drivers-prompt-anthropic"], version = "^0.29.1"}
-attrs = "^23.1.0"
+griptape = {git="https://github.com/griptape-ai/griptape",branch="dev", extras=["drivers-embedding-voyageai","drivers-prompt-anthropic"]}
+attrs = "^24.2.0"
 pymupdf = "^1.24.7"
 argparse = "^1.4.0"
 azure-identity = "^1.17.1"