From bcbf619c9d0415633236a9b04c2872e00221c951 Mon Sep 17 00:00:00 2001 From: Ennio Pastore Date: Thu, 6 Feb 2025 13:32:24 +0100 Subject: [PATCH 1/8] Update amazon_bedrock_tokenizer.py Included nova models and fixed minor issues --- .../tokenizers/amazon_bedrock_tokenizer.py | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/griptape/tokenizers/amazon_bedrock_tokenizer.py b/griptape/tokenizers/amazon_bedrock_tokenizer.py index 9bf485907..466e368cc 100644 --- a/griptape/tokenizers/amazon_bedrock_tokenizer.py +++ b/griptape/tokenizers/amazon_bedrock_tokenizer.py @@ -10,27 +10,51 @@ class AmazonBedrockTokenizer(BaseTokenizer): MODEL_PREFIXES_TO_MAX_INPUT_TOKENS = { "anthropic.claude-3": 200000, "anthropic.claude-v2:1": 200000, - "anthropic.claude": 100000, + "anthropic.claude-v2": 100000, + "anthropic.claude-instant": 100000, "cohere.command-r": 128000, "cohere.embed": 512, "cohere.command": 4000, "cohere": 1024, "ai21": 8192, - "meta.llama3": 8000, - "meta.llama2": 4096, - "mistral": 32000, - "amazon": 4096, + "meta.llama3-8b-instruct": 8000, + "meta.llama3-70b-instruct": 8000, + "meta.llama3-1-8b-instruct": 128000, + "meta.llama3-1-70b-instruct": 128000, + "meta.llama3-1-405b-instruct": 128000, + "meta.llama3-2-1b-instruct": 131000, + "meta.llama3-2-3b-instruct": 131000, + "meta.llama3-2-11b-instruct": 128000, + "meta.llama3-2-90b-instruct": 128000, + "meta.llama3-3-70b-instruct": 128000, + "mistral.mistral-7b-instruct": 32000, + "mistral.mistral-large-2402": 32000, + "mistral.mistral-large-2407": 128000, + "mistral.mistral-small-2402": 32000, + "mistral.mixtral-8x7b-instruct": 32000, + "amazon.nova-pro-v1": 300000, + "amazon.nova-lite-v1": 300000, + "amazon.nova-micro-v1": 128000, + "amazon.titan-text-express-v1": 8000, + "amazon.titan-text-lite-v1": 4000, + "amazon.titan-text-premier-v1": 32000, } MODEL_PREFIXES_TO_MAX_OUTPUT_TOKENS = { - "anthropic.claude": 4096, + "anthropic.claude-3-5": 8192, + "anthropic.claude-3-haiku": 4096, + "anthropic.claude-3-opus": 4096, + "anthropic.claude-3-sonnet": 4096, + "anthropic.claude-v2": 4096, + "anthropic.claude-instant": 4096, "cohere": 4096, "ai21.j2": 8191, "meta": 2048, "amazon.titan-text-lite": 4096, "amazon.titan-text-express": 8192, "amazon.titan-text-premier": 3072, - "amazon": 4096, - "mistral": 8192, + "amazon.nova": 5000, + "mistral.mistral": 8192, + "mistral.mixtral": 4096, } model: str = field(kw_only=True) From 8e60d2dcac8395bee459c1446f0ff86c60b85e05 Mon Sep 17 00:00:00 2001 From: Ennio Pastore Date: Fri, 7 Feb 2025 10:17:13 +0100 Subject: [PATCH 2/8] Update amazon_bedrock_tokenizer.py --- griptape/tokenizers/amazon_bedrock_tokenizer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/griptape/tokenizers/amazon_bedrock_tokenizer.py b/griptape/tokenizers/amazon_bedrock_tokenizer.py index 466e368cc..2338fcc73 100644 --- a/griptape/tokenizers/amazon_bedrock_tokenizer.py +++ b/griptape/tokenizers/amazon_bedrock_tokenizer.py @@ -10,8 +10,7 @@ class AmazonBedrockTokenizer(BaseTokenizer): MODEL_PREFIXES_TO_MAX_INPUT_TOKENS = { "anthropic.claude-3": 200000, "anthropic.claude-v2:1": 200000, - "anthropic.claude-v2": 100000, - "anthropic.claude-instant": 100000, + "anthropic.claude": 100000, "cohere.command-r": 128000, "cohere.embed": 512, "cohere.command": 4000, From a2e37777a26ca64781081dd149f75fc5bddc47e7 Mon Sep 17 00:00:00 2001 From: Ennio Pastore Date: Fri, 7 Feb 2025 10:56:08 +0100 Subject: [PATCH 3/8] Update amazon_bedrock_tokenizer.py --- griptape/tokenizers/amazon_bedrock_tokenizer.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/griptape/tokenizers/amazon_bedrock_tokenizer.py b/griptape/tokenizers/amazon_bedrock_tokenizer.py index 2338fcc73..aaae2b3e8 100644 --- a/griptape/tokenizers/amazon_bedrock_tokenizer.py +++ b/griptape/tokenizers/amazon_bedrock_tokenizer.py @@ -40,11 +40,7 @@ class AmazonBedrockTokenizer(BaseTokenizer): } MODEL_PREFIXES_TO_MAX_OUTPUT_TOKENS = { "anthropic.claude-3-5": 8192, - "anthropic.claude-3-haiku": 4096, - "anthropic.claude-3-opus": 4096, - "anthropic.claude-3-sonnet": 4096, - "anthropic.claude-v2": 4096, - "anthropic.claude-instant": 4096, + "anthropic.claude": 4096, "cohere": 4096, "ai21.j2": 8191, "meta": 2048, From 1d367edc47dc9a048cb7e3c71885371478e307ec Mon Sep 17 00:00:00 2001 From: Ennio Pastore Date: Mon, 10 Feb 2025 10:40:01 +0100 Subject: [PATCH 4/8] Update griptape/tokenizers/amazon_bedrock_tokenizer.py Co-authored-by: Collin Dutter --- griptape/tokenizers/amazon_bedrock_tokenizer.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/griptape/tokenizers/amazon_bedrock_tokenizer.py b/griptape/tokenizers/amazon_bedrock_tokenizer.py index aaae2b3e8..9a157fcec 100644 --- a/griptape/tokenizers/amazon_bedrock_tokenizer.py +++ b/griptape/tokenizers/amazon_bedrock_tokenizer.py @@ -26,10 +26,8 @@ class AmazonBedrockTokenizer(BaseTokenizer): "meta.llama3-2-11b-instruct": 128000, "meta.llama3-2-90b-instruct": 128000, "meta.llama3-3-70b-instruct": 128000, - "mistral.mistral-7b-instruct": 32000, - "mistral.mistral-large-2402": 32000, - "mistral.mistral-large-2407": 128000, - "mistral.mistral-small-2402": 32000, + "mistral.large-2407": 128000, + "mistral.mistral": 32000, "mistral.mixtral-8x7b-instruct": 32000, "amazon.nova-pro-v1": 300000, "amazon.nova-lite-v1": 300000, From 6976510e338de191e21a4a972d57643b11009ac9 Mon Sep 17 00:00:00 2001 From: Ennio Pastore Date: Mon, 10 Feb 2025 10:40:10 +0100 Subject: [PATCH 5/8] Update griptape/tokenizers/amazon_bedrock_tokenizer.py Co-authored-by: Collin Dutter --- griptape/tokenizers/amazon_bedrock_tokenizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/griptape/tokenizers/amazon_bedrock_tokenizer.py b/griptape/tokenizers/amazon_bedrock_tokenizer.py index 9a157fcec..255f24def 100644 --- a/griptape/tokenizers/amazon_bedrock_tokenizer.py +++ b/griptape/tokenizers/amazon_bedrock_tokenizer.py @@ -28,7 +28,7 @@ class AmazonBedrockTokenizer(BaseTokenizer): "meta.llama3-3-70b-instruct": 128000, "mistral.large-2407": 128000, "mistral.mistral": 32000, - "mistral.mixtral-8x7b-instruct": 32000, + "mistral.mixtral": 32000, "amazon.nova-pro-v1": 300000, "amazon.nova-lite-v1": 300000, "amazon.nova-micro-v1": 128000, From d7c130247256ddb3e5ca3903720178121ec60d2e Mon Sep 17 00:00:00 2001 From: Ennio Pastore Date: Mon, 10 Feb 2025 10:40:35 +0100 Subject: [PATCH 6/8] Update griptape/tokenizers/amazon_bedrock_tokenizer.py Co-authored-by: Collin Dutter --- griptape/tokenizers/amazon_bedrock_tokenizer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/griptape/tokenizers/amazon_bedrock_tokenizer.py b/griptape/tokenizers/amazon_bedrock_tokenizer.py index 255f24def..0d3a0996d 100644 --- a/griptape/tokenizers/amazon_bedrock_tokenizer.py +++ b/griptape/tokenizers/amazon_bedrock_tokenizer.py @@ -29,9 +29,8 @@ class AmazonBedrockTokenizer(BaseTokenizer): "mistral.large-2407": 128000, "mistral.mistral": 32000, "mistral.mixtral": 32000, - "amazon.nova-pro-v1": 300000, - "amazon.nova-lite-v1": 300000, "amazon.nova-micro-v1": 128000, + "amazon.nova": 300000, "amazon.titan-text-express-v1": 8000, "amazon.titan-text-lite-v1": 4000, "amazon.titan-text-premier-v1": 32000, From 61fcdc78bf9fc6a5f876f4c7ff68d37dd2ac34d5 Mon Sep 17 00:00:00 2001 From: Ennio Pastore Date: Mon, 10 Feb 2025 10:40:47 +0100 Subject: [PATCH 7/8] Update griptape/tokenizers/amazon_bedrock_tokenizer.py Co-authored-by: Collin Dutter --- griptape/tokenizers/amazon_bedrock_tokenizer.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/griptape/tokenizers/amazon_bedrock_tokenizer.py b/griptape/tokenizers/amazon_bedrock_tokenizer.py index 0d3a0996d..68006803c 100644 --- a/griptape/tokenizers/amazon_bedrock_tokenizer.py +++ b/griptape/tokenizers/amazon_bedrock_tokenizer.py @@ -18,9 +18,6 @@ class AmazonBedrockTokenizer(BaseTokenizer): "ai21": 8192, "meta.llama3-8b-instruct": 8000, "meta.llama3-70b-instruct": 8000, - "meta.llama3-1-8b-instruct": 128000, - "meta.llama3-1-70b-instruct": 128000, - "meta.llama3-1-405b-instruct": 128000, "meta.llama3-2-1b-instruct": 131000, "meta.llama3-2-3b-instruct": 131000, "meta.llama3-2-11b-instruct": 128000, From a77218f5d33453edc4e4fee78f38a3ad49fefbcb Mon Sep 17 00:00:00 2001 From: Ennio Pastore Date: Mon, 10 Feb 2025 10:40:58 +0100 Subject: [PATCH 8/8] Update griptape/tokenizers/amazon_bedrock_tokenizer.py Co-authored-by: Collin Dutter --- griptape/tokenizers/amazon_bedrock_tokenizer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/griptape/tokenizers/amazon_bedrock_tokenizer.py b/griptape/tokenizers/amazon_bedrock_tokenizer.py index 68006803c..b60523748 100644 --- a/griptape/tokenizers/amazon_bedrock_tokenizer.py +++ b/griptape/tokenizers/amazon_bedrock_tokenizer.py @@ -20,9 +20,7 @@ class AmazonBedrockTokenizer(BaseTokenizer): "meta.llama3-70b-instruct": 8000, "meta.llama3-2-1b-instruct": 131000, "meta.llama3-2-3b-instruct": 131000, - "meta.llama3-2-11b-instruct": 128000, - "meta.llama3-2-90b-instruct": 128000, - "meta.llama3-3-70b-instruct": 128000, + "meta.llama3": 128000, "mistral.large-2407": 128000, "mistral.mistral": 32000, "mistral.mixtral": 32000,