fix conflicts

config/config2.example.yaml

@@ -1,17 +1,24 @@
 llm:
-  api_type: "openai"  # or azure / ollama / open_llm etc. Check LLMType for more options
+  api_type: "openai"  # or azure / ollama / groq etc.
   base_url: "YOUR_BASE_URL"
   api_key: "YOUR_API_KEY"
-  model: "gpt-4-turbo-preview"  # or gpt-3.5-turbo-1106 / gpt-4-1106-preview
+  model: "gpt-4-turbo"  # or gpt-3.5-turbo
   proxy: "YOUR_PROXY"  # for LLM API requests
   # timeout: 600 # Optional. If set to 0, default value is 300.
-  pricing_plan: "" # Optional. If invalid, it will be automatically filled in with the value of the `model`.
-  # Azure-exclusive pricing plan mappings：
-  # - gpt-3.5-turbo 4k: "gpt-3.5-turbo-1106"
-  # - gpt-4-turbo: "gpt-4-turbo-preview"
-  # - gpt-4-turbo-vision: "gpt-4-vision-preview"
-  # - gpt-4 8k: "gpt-4"
-  # See for more: https://azure.microsoft.com/en-us/pricing/details/cognitive-services/openai-service/
+  # Details: https://azure.microsoft.com/en-us/pricing/details/cognitive-services/openai-service/
+  pricing_plan: "" # Optional. Use for Azure LLM when its model name is not the same as OpenAI's
+
+
+# RAG Embedding.
+# For backward compatibility, if the embedding is not set and the llm's api_type is either openai or azure, the llm's config will be used. 
+embedding:
+  api_type: "" # openai / azure / gemini / ollama etc. Check EmbeddingType for more options.
+  base_url: ""
+  api_key: ""
+  model: ""
+  api_version: ""
+  embed_batch_size: 100
+  dimensions: # output dimension of embedding model
 
 # Role's custom configuration
 roles:
@@ -59,7 +66,7 @@ browser:
 
 mermaid:
   engine: "pyppeteer"
-  path: "/Applications/Google Chrome.app"
+  pyppeteer_path: "/Applications/Google Chrome.app"
 
 redis:
   host: "YOUR_HOST"
@@ -98,3 +105,25 @@ iflytek_api_key: "YOUR_API_KEY"
 iflytek_api_secret: "YOUR_API_SECRET"
 
 metagpt_tti_url: "YOUR_MODEL_URL"
+
+omniparse:
+    api_key: "YOUR_API_KEY"
+    base_url: "YOUR_BASE_URL"
+
+models:
+#  "YOUR_MODEL_NAME_1 or YOUR_API_TYPE_1": # model: "gpt-4-turbo"  # or gpt-3.5-turbo
+#    api_type: "openai"  # or azure / ollama / groq etc.
+#    base_url: "YOUR_BASE_URL"
+#    api_key: "YOUR_API_KEY"
+#    proxy: "YOUR_PROXY"  # for LLM API requests
+#    # timeout: 600 # Optional. If set to 0, default value is 300.
+#    # Details: https://azure.microsoft.com/en-us/pricing/details/cognitive-services/openai-service/
+#    pricing_plan: "" # Optional. Use for Azure LLM when its model name is not the same as OpenAI's
+#  "YOUR_MODEL_NAME_2 or YOUR_API_TYPE_2": # api_type: "openai"  # or azure / ollama / groq etc.
+#    api_type: "openai"  # or azure / ollama / groq etc.
+#    base_url: "YOUR_BASE_URL"
+#    api_key: "YOUR_API_KEY"
+#    proxy: "YOUR_PROXY"  # for LLM API requests
+#    # timeout: 600 # Optional. If set to 0, default value is 300.
+#    # Details: https://azure.microsoft.com/en-us/pricing/details/cognitive-services/openai-service/
+#    pricing_plan: "" # Optional. Use for Azure LLM when its model name is not the same as OpenAI's

config/config2.yaml

@@ -1,7 +1,8 @@
 # Full Example: https://github.com/geekan/MetaGPT/blob/main/config/config2.example.yaml
 # Reflected Code: https://github.com/geekan/MetaGPT/blob/main/metagpt/config2.py
+# Config Docs: https://docs.deepwisdom.ai/main/en/guide/get_started/configuration.html
 llm:
-  api_type: "openai"  # or azure / ollama / open_llm etc. Check LLMType for more options
-  model: "gpt-4-turbo-preview"  # or gpt-3.5-turbo-1106 / gpt-4-1106-preview
+  api_type: "openai"  # or azure / ollama / groq etc.
+  model: "gpt-4-turbo"  # or gpt-3.5-turbo
   base_url: "https://api.openai.com/v1"  # or forward url / other llm url
   api_key: "YOUR_API_KEY"

config/examples/anthropic-claude-3-5-sonnet.yaml

@@ -0,0 +1,5 @@
+llm:
+  api_type: 'claude' # or anthropic
+  base_url: 'https://api.anthropic.com'
+  api_key: 'YOUR_API_KEY'
+  model: 'claude-3-5-sonnet-20240620' # or 'claude-3-opus-20240229'

config/examples/aws-bedrock.yaml

@@ -0,0 +1,10 @@
+llm:  
+  api_type: 'bedrock' 
+  access_key: 'YOUR_API_KEY'
+  secret_key: 'YOUR_API_SECRET'
+
+  region_name: "us-east-1" 
+  model: "meta.llama2-70b-chat-v1"
+  # model: "anthropic.claude-3-sonnet-20240229-v1:0"
+  # model: "mistral.mixtral-8x7b-instruct-v0:1"
+  # model: "meta.llama2-13b-chat-v1"

config/examples/google-gemini.yaml

@@ -0,0 +1,4 @@
+llm:
+  api_type: 'gemini'
+  api_key: 'YOUR_API_KEY'
+  model: 'gemini-pro'

config/examples/groq-llama3-70b.yaml

@@ -0,0 +1,5 @@
+llm:
+  # Visit https://console.groq.com/keys to create api key
+  base_url: "https://api.groq.com/openai/v1"
+  api_key: "YOUR_API_KEY"
+  model: "llama3-70b-8192"  # llama3-8b-8192，llama3-70b-8192，llama2-70b-4096 ，mixtral-8x7b-32768，gemma-7b-it

config/examples/huoshan_ark.yaml

@@ -0,0 +1,5 @@
+llm:
+  api_type: "ark"  
+  model: ""  # your model endpoint like ep-xxx
+  base_url: "https://ark.cn-beijing.volces.com/api/v3"  
+  api_key: "" # your api-key like ey……

config/examples/openai-gpt-3.5-turbo.yaml

@@ -0,0 +1,5 @@
+llm:
+  api_key: "YOUR_API_KEY"
+  model: "gpt-3.5-turbo"
+  #proxy: "http://<ip>:<port>"
+  #base_url: "https://<forward_url>/v1"

config/examples/openai-gpt-4-turbo.yaml

@@ -0,0 +1,6 @@
+llm:
+  api_key: "YOUR_API_KEY"
+  model: "gpt-4-turbo"
+  #proxy: "http://<ip>:<port>"
+  #base_url: "https://<forward_url>/v1"
+

config/examples/openrouter-llama3-70b-instruct.yaml

@@ -0,0 +1,5 @@
+llm:
+  api_type: openrouter
+  base_url: "https://openrouter.ai/api/v1"
+  api_key: "YOUR_API_KEY"
+  model: meta-llama/llama-3-70b-instruct

config/examples/spark_lite.yaml

@@ -0,0 +1,10 @@
+# 适用于讯飞星火的spark-lite 参考 https://www.xfyun.cn/doc/spark/Web.html#_2-function-call%E8%AF%B4%E6%98%8E
+
+llm:
+  api_type: "spark"
+  # 对应模型的url 参考 https://www.xfyun.cn/doc/spark/Web.html#_1-%E6%8E%A5%E5%8F%A3%E8%AF%B4%E6%98%8E
+  base_url: "ws(s)://spark-api.xf-yun.com/v1.1/chat" 
+  app_id: ""
+  api_key: ""
+  api_secret: ""
+  domain: "general" # 取值为 [general,generalv2,generalv3,generalv3.5] 和url一一对应

config/puppeteer-config.json

@@ -1,6 +1,4 @@
 {
-    "executablePath": "/usr/bin/chromium",
-    "args": [
-        "--no-sandbox"
-    ]
-}
+  "executablePath": "/usr/bin/chromium",
+  "args": ["--no-sandbox"]
+}