download html source from remote

.dockerignore

@@ -7,3 +7,4 @@ data
 geckodriver.log
 logs
 storage
+static

.gitignore

@@ -170,4 +170,5 @@ output
 tmp.png
 
 storage/*
-logs
+logs
+static

Dockerfile

@@ -1,4 +1,13 @@
 # Use a base image with Python3.9 and Nodejs20 slim version
+FROM nikolaik/python-nodejs:python3.9-nodejs20-slim as static
+
+WORKDIR /app
+
+COPY init.sh init.sh
+
+RUN chmod u+x init.sh && ./init.sh
+
+
 FROM nikolaik/python-nodejs:python3.9-nodejs20-slim
 
 USER root
@@ -27,5 +36,7 @@ RUN pip install --no-cache-dir -r requirements.txt && \
     mkdir -p /app/storage && chmod 777 /app/storage
 
 COPY . .
+COPY --from=static /app/static /app/static
+COPY config/template.yaml static/config.yaml
 
 CMD ["python", "app.py"]

app.py

@@ -152,8 +152,10 @@ async def create_message(req_model: NewMsg, request: Request):
     """
     Session message stream
     """
+    tc_id = 0
     try:
-        config = {k.upper(): v for k, v in req_model.config.items()}
+        exclude_keys = CONFIG.get("SERVER_METAGPT_CONFIG_EXCLUDE", [])
+        config = {k.upper(): v for k, v in req_model.config.items() if k not in exclude_keys}
         set_context(config, uuid.uuid4().hex)
 
         msg_queue = deque()
@@ -190,7 +192,6 @@ async def create_message(req_model: NewMsg, request: Request):
 
         asyncio.create_task(stop_if_disconnect())
 
-        tc_id = 0
         while True:
             tc_id += 1
             if await request.is_disconnected():
@@ -223,6 +224,8 @@ async def create_message(req_model: NewMsg, request: Request):
             yield think_act_prompt.prompt + "\n\n"
             answer.add_think_act(think_act_prompt)
         yield answer.prompt + "\n\n"  # Notify the front-end that the message is complete.
+    except asyncio.CancelledError:
+        task.cancel()
     except Exception as ex:
         description = str(ex)
         answer = traceback.format_exc()
@@ -236,7 +239,9 @@ async def create_message(req_model: NewMsg, request: Request):
         think_act_prompt = ThinkActPrompt(step=step)
         yield think_act_prompt.prompt + "\n\n"
     finally:
-        shutil.rmtree(CONFIG.WORKSPACE_PATH)
+        CONFIG.WORKSPACE_PATH: pathlib.Path
+        if CONFIG.WORKSPACE_PATH.exists():
+            shutil.rmtree(CONFIG.WORKSPACE_PATH)
 
 
 default_llm_stream_log = partial(print, end="")
@@ -270,7 +275,7 @@ app = FastAPI()
 app.mount(
     "/storage",
     StaticFiles(directory="./storage/"),
-    name="static",
+    name="storage",
 )
 
 app.add_api_route(
@@ -283,8 +288,8 @@ app.add_api_route(
 
 app.mount(
     "/",
-    StaticFiles(directory="./src/", html=True),
-    name="src",
+    StaticFiles(directory="./static/", html=True, follow_symlink=True),
+    name="static",
 )
 
 
@@ -292,7 +297,8 @@ set_llm_stream_logfunc(llm_stream_log)
 
 
 def main():
-    uvicorn.run(app="__main__:app", host="0.0.0.0", port=7860)
+    server_config = CONFIG.get("SERVER_UVICORN", {})
+    uvicorn.run(app="__main__:app", **server_config)
 
 
 if __name__ == "__main__":

config/config.yaml

@@ -94,8 +94,8 @@ RPM: 10
 
 #### for Mermaid CLI
 ## If you installed mmdc (Mermaid CLI) only for metagpt then enable the following configuration.
-#PUPPETEER_CONFIG: "./config/puppeteer-config.json"
-#MMDC: "./node_modules/.bin/mmdc"
+# PUPPETEER_CONFIG: "./config/puppeteer-config.json"
+# MMDC: "./node_modules/.bin/mmdc"
 
 
 ### for calc_usage
@@ -110,7 +110,7 @@ RPM: 10
 # MERMAID_ENGINE: nodejs
 
 ### browser path for pyppeteer engine, support Chrome, Chromium,MS Edge
-#PYPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable"
+# PYPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable"
 
 ### for repair non-openai LLM's output when parse json-text if PROMPT_FORMAT=json
 ### due to non-openai LLM's output will not always follow the instruction, so here activate a post-process
@@ -134,3 +134,18 @@ LOCAL_BASE_URL: "storage"
 # S3_ENDPOINT_URL: ""
 # S3_BUCKET: ""
 # S3_SECURE: false
+
+SERVER_UVICORN:
+  host: 0.0.0.0
+  port: 7860
+
+SERVER_METAGPT_CONFIG_EXCLUDE:
+  - MERMAID_ENGINE
+  - PYPPETEER_EXECUTABLE_PATH
+  - DISABLE_LLM_PROVIDER_CHECK
+  - STORAGE_TYPE
+  - LOCAL_ROOT
+  - LOCAL_BASE_URL
+  - MMDC
+  - PUPPETEER_CONFIG
+  - WORKSPACE_PATH

config/template.yaml

@@ -0,0 +1,84 @@
+#### if OpenAI
+## The official OPENAI_BASE_URL is https://api.openai.com/v1
+## If the official OPENAI_BASE_URL is not available, we recommend using the [openai-forward](https://github.com/beidongjiedeguang/openai-forward).
+## Or, you can configure OPENAI_PROXY to access official OPENAI_BASE_URL.
+# OPENAI_BASE_URL: "https://api.openai.com/v1"
+# OPENAI_PROXY: "http://127.0.0.1:8118"
+# OPENAI_API_KEY: "YOUR_API_KEY"  # set the value to sk-xxx if you host the openai interface for open llm model
+# OPENAI_API_MODEL: "gpt-4-1106-preview"
+# MAX_TOKENS: 4096
+# RPM: 10
+
+#### if Spark
+#SPARK_APPID : "YOUR_APPID"
+#SPARK_API_SECRET : "YOUR_APISecret"
+#SPARK_API_KEY : "YOUR_APIKey"
+#DOMAIN : "generalv2"
+#SPARK_URL : "ws://spark-api.xf-yun.com/v2.1/chat"
+
+#### if Anthropic
+#ANTHROPIC_API_KEY: "YOUR_API_KEY"
+
+#### if AZURE, check https://github.com/openai/openai-cookbook/blob/main/examples/azure/chat.ipynb
+#OPENAI_API_TYPE: "azure"
+#OPENAI_BASE_URL: "YOUR_AZURE_ENDPOINT"
+#OPENAI_API_KEY: "YOUR_AZURE_API_KEY"
+#OPENAI_API_VERSION: "YOUR_AZURE_API_VERSION"
+#DEPLOYMENT_NAME: "YOUR_DEPLOYMENT_NAME"
+
+#### if zhipuai from `https://open.bigmodel.cn`. You can set here or export API_KEY="YOUR_API_KEY"
+# ZHIPUAI_API_KEY: "YOUR_API_KEY"
+
+#### if Google Gemini from `https://ai.google.dev/` and API_KEY from `https://makersuite.google.com/app/apikey`.
+#### You can set here or export GOOGLE_API_KEY="YOUR_API_KEY"
+# GEMINI_API_KEY: "YOUR_API_KEY"
+
+#### if use self-host open llm model with openai-compatible interface
+#OPEN_LLM_API_BASE: "http://127.0.0.1:8000/v1"
+#OPEN_LLM_API_MODEL: "llama2-13b"
+
+
+##### if use Fireworks api
+#FIREWORKS_API_KEY: "YOUR_API_KEY"
+#FIREWORKS_API_BASE: "https://api.fireworks.ai/inference/v1"
+#FIREWORKS_API_MODEL: "YOUR_LLM_MODEL"  # example, accounts/fireworks/models/llama-v2-13b-chat
+
+#### if use self-host open llm model by ollama
+# OLLAMA_API_BASE: http://127.0.0.1:11434/api
+# OLLAMA_API_MODEL: llama2
+
+#### for Search
+
+## Supported values: serpapi/google/serper/ddg
+#SEARCH_ENGINE: serpapi
+
+## Visit https://serpapi.com/ to get key.
+#SERPAPI_API_KEY: "YOUR_API_KEY"
+
+## Visit https://console.cloud.google.com/apis/credentials to get key.
+#GOOGLE_API_KEY: "YOUR_API_KEY"
+## Visit https://programmablesearchengine.google.com/controlpanel/create to get id.
+#GOOGLE_CSE_ID: "YOUR_CSE_ID"
+
+## Visit https://serper.dev/ to get key.
+#SERPER_API_KEY: "YOUR_API_KEY"
+
+#### for TTS
+
+#AZURE_TTS_SUBSCRIPTION_KEY: "YOUR_API_KEY"
+#AZURE_TTS_REGION: "eastus"
+
+#### for Stable Diffusion
+## Use SD service, based on https://github.com/AUTOMATIC1111/stable-diffusion-webui
+#SD_URL: "YOUR_SD_URL"
+#SD_T2I_API: "/sdapi/v1/txt2img"
+
+#### for Execution
+#LONG_TERM_MEMORY: false
+
+### for repair non-openai LLM's output when parse json-text if PROMPT_FORMAT=json
+### due to non-openai LLM's output will not always follow the instruction, so here activate a post-process
+### repair operation on the content extracted from LLM's raw output. Warning, it improves the result but not fix all cases.
+# REPAIR_LLM_OUTPUT: false
+
+# PROMPT_FORMAT: json #json or markdown

init.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/bash
+set -ex
+
+while [[ $# -gt 0 ]]; do
+  key="$1"
+  case $key in
+    --update-config-template)
+      UPDATE_CONFIG_TEMPLATE=true
+      shift
+      ;;
+    *)
+      # unknown option
+      shift
+      ;;
+  esac
+done
+
+rm -rf static
+
+wget -O dist.tar.gz https://public-frontend-1300249583.cos.ap-nanjing.myqcloud.com/test-hp-metagpt-web/dist-20231228164728.tar.gz
+tar xvzf dist.tar.gz
+mv dist static
+rm dist.tar.gz
+
+if [ "$UPDATE_CONFIG_TEMPLATE" = true ]; then
+    rm static/config.yaml
+    ln -s ../config/template.yaml static/config.yaml
+fi