From fd65c0fa49fd2fc05ef176d63bd236b208d8fac8 Mon Sep 17 00:00:00 2001 From: crazywoola <427733928@qq.com> Date: Thu, 12 Dec 2024 14:03:08 +0800 Subject: [PATCH 1/3] resolve conflicts --- .../model_providers/groq/llm/_position.yaml | 1 + ...11b-text-preview.yaml => gemma-7b-it.yaml} | 8 +++--- ...0b-text-preview.yaml => gemma2-9b-it.yaml} | 8 +++--- .../groq/llm/llama-3.1-70b-versatile.yaml | 4 +-- .../groq/llm/llama-3.3-70b-specdec\t.yaml" | 25 +++++++++++++++++++ ...llama3-groq-70b-8192-tool-use-preview.yaml | 25 +++++++++++++++++++ 6 files changed, 61 insertions(+), 10 deletions(-) rename api/core/model_runtime/model_providers/groq/llm/{llama-3.2-11b-text-preview.yaml => gemma-7b-it.yaml} (72%) rename api/core/model_runtime/model_providers/groq/llm/{llama-3.2-90b-text-preview.yaml => gemma2-9b-it.yaml} (72%) create mode 100644 "api/core/model_runtime/model_providers/groq/llm/llama-3.3-70b-specdec\t.yaml" create mode 100644 api/core/model_runtime/model_providers/groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml diff --git a/api/core/model_runtime/model_providers/groq/llm/_position.yaml b/api/core/model_runtime/model_providers/groq/llm/_position.yaml index 0613b19f87ee5e..279c1bcbe5ae92 100644 --- a/api/core/model_runtime/model_providers/groq/llm/_position.yaml +++ b/api/core/model_runtime/model_providers/groq/llm/_position.yaml @@ -1,4 +1,5 @@ - llama-3.1-405b-reasoning +- llama-3.3-70b-versatile - llama-3.1-70b-versatile - llama-3.1-8b-instant - llama3-70b-8192 diff --git a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml b/api/core/model_runtime/model_providers/groq/llm/gemma-7b-it.yaml similarity index 72% rename from api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml rename to api/core/model_runtime/model_providers/groq/llm/gemma-7b-it.yaml index 019d45372361d3..02f84e95f6e348 100644 --- a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml +++ b/api/core/model_runtime/model_providers/groq/llm/gemma-7b-it.yaml @@ -1,13 +1,13 @@ -model: llama-3.2-11b-text-preview +model: gemma-7b-it label: - zh_Hans: Llama 3.2 11B Text (Preview) - en_US: Llama 3.2 11B Text (Preview) + zh_Hans: Gemma 7B Instruction Tuned + en_US: Gemma 7B Instruction Tuned model_type: llm features: - agent-thought model_properties: mode: chat - context_size: 131072 + context_size: 8192 parameter_rules: - name: temperature use_template: temperature diff --git a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml b/api/core/model_runtime/model_providers/groq/llm/gemma2-9b-it.yaml similarity index 72% rename from api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml rename to api/core/model_runtime/model_providers/groq/llm/gemma2-9b-it.yaml index 3b34e7c07996bd..dad496f668ab94 100644 --- a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml +++ b/api/core/model_runtime/model_providers/groq/llm/gemma2-9b-it.yaml @@ -1,13 +1,13 @@ -model: llama-3.2-90b-text-preview +model: gemma2-9b-it label: - zh_Hans: Llama 3.2 90B Text (Preview) - en_US: Llama 3.2 90B Text (Preview) + zh_Hans: Gemma 2 9B Instruction Tuned + en_US: Gemma 2 9B Instruction Tuned model_type: llm features: - agent-thought model_properties: mode: chat - context_size: 131072 + context_size: 8192 parameter_rules: - name: temperature use_template: temperature diff --git a/api/core/model_runtime/model_providers/groq/llm/llama-3.1-70b-versatile.yaml b/api/core/model_runtime/model_providers/groq/llm/llama-3.1-70b-versatile.yaml index ab5f6ab05efe31..7bb60b10c3ef89 100644 --- a/api/core/model_runtime/model_providers/groq/llm/llama-3.1-70b-versatile.yaml +++ b/api/core/model_runtime/model_providers/groq/llm/llama-3.1-70b-versatile.yaml @@ -1,7 +1,7 @@ model: llama-3.1-70b-versatile label: - zh_Hans: Llama-3.1-70b-versatile - en_US: Llama-3.1-70b-versatile + zh_Hans: Llama-3.1-70b-versatile (DEPRECATED) + en_US: Llama-3.1-70b-versatile (DEPRECATED) model_type: llm features: - agent-thought diff --git "a/api/core/model_runtime/model_providers/groq/llm/llama-3.3-70b-specdec\t.yaml" "b/api/core/model_runtime/model_providers/groq/llm/llama-3.3-70b-specdec\t.yaml" new file mode 100644 index 00000000000000..ac6d529c34112b --- /dev/null +++ "b/api/core/model_runtime/model_providers/groq/llm/llama-3.3-70b-specdec\t.yaml" @@ -0,0 +1,25 @@ +model: llama-3.3-70b-specdec +label: + zh_Hans: Llama 3.3 70b Speculative Decoding (PREVIEW) + en_US: Llama 3.3 70b Speculative Decoding (PREVIEW) +model_type: llm +features: + - agent-thought +model_properties: + mode: chat + context_size: 131072 +parameter_rules: + - name: temperature + use_template: temperature + - name: top_p + use_template: top_p + - name: max_tokens + use_template: max_tokens + default: 512 + min: 1 + max: 8192 +pricing: + input: '0.05' + output: '0.1' + unit: '0.000001' + currency: USD \ No newline at end of file diff --git a/api/core/model_runtime/model_providers/groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml b/api/core/model_runtime/model_providers/groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml new file mode 100644 index 00000000000000..101d89b5fe28ae --- /dev/null +++ b/api/core/model_runtime/model_providers/groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml @@ -0,0 +1,25 @@ +model: llama3-groq-70b-8192-tool-use-preview +label: + zh_Hans: Llama3-groq-70b-8192-tool-use (PREVIEW) + en_US: Llama3-groq-70b-8192-tool-use (PREVIEW) +model_type: llm +features: + - agent-thought +model_properties: + mode: chat + context_size: 8192 +parameter_rules: + - name: temperature + use_template: temperature + - name: top_p + use_template: top_p + - name: max_tokens + use_template: max_tokens + default: 512 + min: 1 + max: 8192 +pricing: + input: '0.05' + output: '0.08' + unit: '0.000001' + currency: USD \ No newline at end of file From a228fb8478126f73f5b969cd3b7bd3827247a10f Mon Sep 17 00:00:00 2001 From: Alok Shrivastwa Date: Mon, 9 Dec 2024 10:51:06 +0530 Subject: [PATCH 2/3] Added deprecated: true in the yaml file instead of deleting it. --- .../groq/llm/llama-3.1-70b-versatile.yaml | 1 + .../groq/llm/llama-3.2-11b-text-preview.yaml | 26 +++++++++++++++++++ .../groq/llm/llama-3.2-90b-text-preview.yaml | 26 +++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml create mode 100644 api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml diff --git a/api/core/model_runtime/model_providers/groq/llm/llama-3.1-70b-versatile.yaml b/api/core/model_runtime/model_providers/groq/llm/llama-3.1-70b-versatile.yaml index 7bb60b10c3ef89..01323a1b8a74f4 100644 --- a/api/core/model_runtime/model_providers/groq/llm/llama-3.1-70b-versatile.yaml +++ b/api/core/model_runtime/model_providers/groq/llm/llama-3.1-70b-versatile.yaml @@ -1,4 +1,5 @@ model: llama-3.1-70b-versatile +deprecated: true label: zh_Hans: Llama-3.1-70b-versatile (DEPRECATED) en_US: Llama-3.1-70b-versatile (DEPRECATED) diff --git a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml b/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml new file mode 100644 index 00000000000000..f43bfac1456789 --- /dev/null +++ b/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml @@ -0,0 +1,26 @@ +model: llama-3.2-11b-text-preview +deprecated: true +label: + zh_Hans: Llama 3.2 11B Text (Preview) + en_US: Llama 3.2 11B Text (Preview) +model_type: llm +features: + - agent-thought +model_properties: + mode: chat + context_size: 131072 +parameter_rules: + - name: temperature + use_template: temperature + - name: top_p + use_template: top_p + - name: max_tokens + use_template: max_tokens + default: 512 + min: 1 + max: 8192 +pricing: + input: '0.05' + output: '0.1' + unit: '0.000001' + currency: USD \ No newline at end of file diff --git a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml b/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml new file mode 100644 index 00000000000000..5e3ec6bfc4d385 --- /dev/null +++ b/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml @@ -0,0 +1,26 @@ +model: llama-3.2-90b-text-preview +depraceted: true +label: + zh_Hans: Llama 3.2 90B Text (Preview) + en_US: Llama 3.2 90B Text (Preview) +model_type: llm +features: + - agent-thought +model_properties: + mode: chat + context_size: 131072 +parameter_rules: + - name: temperature + use_template: temperature + - name: top_p + use_template: top_p + - name: max_tokens + use_template: max_tokens + default: 512 + min: 1 + max: 8192 +pricing: + input: '0.05' + output: '0.1' + unit: '0.000001' + currency: USD \ No newline at end of file From d412ff041e50050825a3a7882e1c47ebcab6a69e Mon Sep 17 00:00:00 2001 From: crazywoola <427733928@qq.com> Date: Thu, 12 Dec 2024 14:03:37 +0800 Subject: [PATCH 3/3] resolve conflicts --- .../model_providers/groq/llm/llama-3.2-11b-text-preview.yaml | 2 +- .../model_providers/groq/llm/llama-3.2-90b-text-preview.yaml | 2 +- .../groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml b/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml index f43bfac1456789..3f30d81ae4e26c 100644 --- a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml +++ b/api/core/model_runtime/model_providers/groq/llm/llama-3.2-11b-text-preview.yaml @@ -23,4 +23,4 @@ pricing: input: '0.05' output: '0.1' unit: '0.000001' - currency: USD \ No newline at end of file + currency: USD diff --git a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml b/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml index 5e3ec6bfc4d385..0391a7c890cec4 100644 --- a/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml +++ b/api/core/model_runtime/model_providers/groq/llm/llama-3.2-90b-text-preview.yaml @@ -23,4 +23,4 @@ pricing: input: '0.05' output: '0.1' unit: '0.000001' - currency: USD \ No newline at end of file + currency: USD diff --git a/api/core/model_runtime/model_providers/groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml b/api/core/model_runtime/model_providers/groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml index 101d89b5fe28ae..32ccbf1f4db29b 100644 --- a/api/core/model_runtime/model_providers/groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml +++ b/api/core/model_runtime/model_providers/groq/llm/llama3-groq-70b-8192-tool-use-preview.yaml @@ -22,4 +22,4 @@ pricing: input: '0.05' output: '0.08' unit: '0.000001' - currency: USD \ No newline at end of file + currency: USD