Merge branch 'dev'

Author: xuzexin-hz

README.md

@@ -23,6 +23,7 @@ MCP is also an important part of LLM, so this project can also be used as an mcp
 6. **webSocket combined with asyncio use**
 7. **threading/queue use**
 8. **py program packaged into exe**
+9. **python -m llm_analysis_assistant**
 
 # 2. Project Background
 Before the arrival of true AGI, we will have to go through a long journey, during which we will have to face constant challenges. Whether ordinary people or professionals, their lives will be changed.
@@ -90,6 +91,15 @@ python server.py --is_mock=true --mock_string=你好啊 --looptime=1
 
 ```
 
+### Using uv (recommended)
+
+When using [`uv`](https://docs.astral.sh/uv/) no specific installation is needed. We will use 
+[`uvx`](https://docs.astral.sh/uv/guides/tools/) to directly run *llm-analysis-assistant*.
+
+```
+uvx llm_analysis_assistant
+```
+
 ### Using PIP(🌟)
 
 Alternatively you can install `llm-analysis-assistant` via pip:
@@ -130,6 +140,8 @@ Open the following address in the browser, the url is the sse service address
 
 http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8001/sse
 
+http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8002/sse?++user=xxx # ++user=xxx in the url means the HTTP request header user value is xxx
+
 Or use Cherry Studio to add the mcp service
 
 ![Cherry-Studio-mcp-sse.png](docs/imgs/Cherry-Studio-mcp-sse.png)
@@ -139,6 +151,8 @@ Open the following address in the browser, the url is the streamableHttp service
 
 http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8001/mcp
 
+http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8001/mcp?++user=xxx # ++user=xxx in the url means the HTTP request header user value is xxx
+
 Or use Cherry Studio to add the mcp service
 
 ![mcp-streamable-http.png](docs/imgs/mcp-streamable-http.png)

README_zh.md

@@ -23,6 +23,7 @@ MCP也是LLM中重要的一环,故此项目也可当用做mcp客户端使用,并
 6. **webSocket结合asyncio一起使用**
 7. **threading/queue使用**
 8. **py程序打包成exe**
+9. **支持python -m**
 
 # 2、项目背景
 在真正的AGI到来之前，我们必将经历一段漫长的旅程，期间需要不断面对挑战，无论是普通人还是专业人士，生活都将因此而改变。
@@ -92,6 +93,15 @@ python server.py --is_mock=true --mock_string=你好啊 --looptime=1
 
 ```
 
+### 使用 uv（推荐）
+
+使用 [`uv`](https://docs.astral.sh/uv/) 时无需特殊安装。我们将使用
+[`uvx`](https://docs.astral.sh/uv/guides/tools/) 直接运行 *llm-analysis-assistant*。
+
+```
+uvx llm_analysis_assistant
+```
+
 ### 使用 PIP(🌟)
 
 或者，您可以通过 pip 安装 'llm-analysis-assistant':
@@ -132,6 +142,8 @@ http://127.0.0.1:8000/mcp?url=stdio
 
 http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8001/sse
 
+http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8002/sse?++user=xxx # url中++user=xxx 表示HTTP请求头user值是xxx
+
 或者使用Cherry Studio添加mcp服务
 
 ![Cherry-Studio-mcp-sse.png](docs/imgs/Cherry-Studio-mcp-sse.png)
@@ -141,6 +153,8 @@ http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8001/sse
 
 http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8001/mcp
 
+http://127.0.0.1:8000/mcp?url=http://127.0.0.1:8001/mcp?++user=xxx # url中++user=xxx 表示HTTP请求头user值是xxx
+
 或者使用Cherry Studio添加mcp服务
 
 ![mcp-streamable-http.png](docs/imgs/mcp-streamable-http.png)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "llm_analysis_assistant"
-version = "v0.2.3"
+version = "v0.2.7"
 description = "An LLM analysis assistant to help you understand and implement PMF"
 readme = "README.md"
 requires-python = ">=3.10"

src/llm_analysis_assistant/__init__.py

@@ -1,4 +1,5 @@
 # __init__.py
+
 from llm_analysis_assistant.server import main
 
 if __name__ == '__main__':

src/llm_analysis_assistant/__main__.py

@@ -1,14 +1,6 @@
 # __main__.py
-import importlib.metadata
-import os
 
 from llm_analysis_assistant.server import main
 
 if __name__ == '__main__':
-    os.environ["PROJECT_NAME"] = __package__
-    try:
-        version = importlib.metadata.version("llm_analysis_assistant")
-        os.environ["PROJECT_VERSION"] = 'v' + version
-    except importlib.metadata.PackageNotFoundError:
-        pass
     main()

src/llm_analysis_assistant/pages/execGET.py

@@ -1,9 +1,10 @@
 import asyncio
+import os
 
 from llm_analysis_assistant.pages.mySSE import mySSE_sse
 from llm_analysis_assistant.utils.environ_utils import get_path, get_favicon, streamHeader, get_apikey, \
     get_base_url, my_printHeader, \
-    my_printBody, get_Res_Header, get_query, get_request_server
+    my_printBody, get_Res_Header, get_query, get_request_server, get_real_url
 from llm_analysis_assistant.utils.http_clientx import http_clientx
 from llm_analysis_assistant.utils.js_utils import js_show_page
 from llm_analysis_assistant.utils.logs_utils import write_httplog, get_num, LOG_END_SYMBOL, LogType
@@ -54,7 +55,10 @@ async def my_GET():
             http_url = get_query('url')
             server = get_request_server()
             await streamHeader()
-            await mySSE_sse(True, server.send, num, http_url)
+            http_url = http_url.replace('  ', '++')
+            os.environ["MCP_SSE_URL"] = http_url
+            headers, http_url = get_real_url(http_url)
+            await mySSE_sse(True, server.send, num, http_url, headers)
         return
     if http_url is not None:
         write_httplog(LogType.GET, url_path, num)

src/llm_analysis_assistant/pages/execPost.py

@@ -28,15 +28,15 @@ async def my_POST():
         await my_printHeader({"Content-Type": "application/json; charset=utf-8"})
         http_url = post_json.get('url')
         # llm调用mcp时候
-        if http_url is None and os.environ.get("MCP_HTTP_URL") is not None:
-            parsed_url = urlparse(os.environ.get("MCP_HTTP_URL"))
+        if http_url is None and os.environ.get("MCP_SSE_URL") is not None:
+            parsed_url = urlparse(os.environ.get("MCP_SSE_URL"))
             http_url = parsed_url.scheme + "://" + parsed_url.netloc + '' + url_path
+            mcp_sse_url = os.environ.get("MCP_SSE_URL")
+            if mcp_sse_url.find('++') != -1:
+                _envs = mcp_sse_url[mcp_sse_url.index('++'):]
+                http_url = http_url + "&" + os.environ["PROJECT_NAME"] + "_envs=" + _envs
         # llm调用mcp时候
-        if '/messages/' in url_path or '/message?' in url_path:
-            md5_str = get_md5(url_path)
-        elif '/sse_msg' in url_path:
-            parsed_url = urlparse(post_json.get('url'))
-            md5_str = get_md5(parsed_url.path + "?" + parsed_url.query)
+        md5_str = get_md5(http_url)
         has_same_log = False
         if GlobalVal.logsNumList.get(md5_str) is not None:
             same_num = GlobalVal.logsNumList.get(md5_str)
@@ -47,13 +47,23 @@ async def my_POST():
         write_httplog(LogType.REQ, req_str, same_num)
         await mySSE_msg(post_json, same_num, has_same_log, http_url)
         return
-    num = get_num()
-    write_httplog(LogType.POST, url_path, num)
-    write_httplog(LogType.REQ, req_str, num)
     # mcp streamable-http的调用
     if '/mcp' in url_path:
-        await myMCP_msg(post_json, num)
+        has_same_log = False
+        md5_str = get_md5(url_path)
+        if GlobalVal.logsNumList.get(md5_str) is not None:
+            same_num = GlobalVal.logsNumList.get(md5_str)
+            has_same_log = True
+        else:
+            same_num = get_num()
+            GlobalVal.logsNumList[md5_str] = same_num
+        write_httplog(LogType.POST, url_path, same_num)
+        write_httplog(LogType.REQ, req_str, same_num)
+        await myMCP_msg(post_json, same_num, has_same_log)
         return
+    num = get_num()
+    write_httplog(LogType.POST, url_path, num)
+    write_httplog(LogType.REQ, req_str, num)
     is_mock_str = os.environ.get("IS_MOCK")
     res_type = None
     if '/v1/completions' in url_path: