update

.github/workflows/publish.yml

@@ -1,7 +1,7 @@
 name: Publish to PyPI.org
 on:
   release:
-    types: [ published ]
+    types: [published]
 jobs:
   pypi:
     runs-on: ubuntu-latest
@@ -13,10 +13,10 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.12
       - name: Build package
         run: python3 -m pip install --upgrade build && python3 -m build
       - name: Publish package to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
+          password: ${{ secrets.PYPI_API_TOKEN }}

src/delibird/__init__.py

@@ -1,3 +1,3 @@
-
 from . import _version
-__version__ = _version.get_versions()['version']
+
+__version__ = _version.get_versions()["version"]

src/delibird/cli.py

@@ -0,0 +1,81 @@
+import click
+import psutil
+import subprocess
+
+from delibird.server import app
+from delibird.log import Log, LogLevel
+from delibird.pm import kill_process, http_process
+from delibird.config import read_config
+
+
+@click.group()
+def cli():
+    pass
+
+
+@cli.command()
+@click.option(
+    "--config", "-c", type=click.Path(exists=True), help="指定配置文件", required=True
+)
+def start(config):
+    # init log
+    logger = Log("delibird")
+
+    # print and log
+    logger.echo("Starting...")
+    click.echo("Starting...")
+
+    # check if the program is running
+    if check_process("delibird"):
+        logger.echo("The program is already running", "error")
+        click.echo("The program is already running")
+        return
+
+    if not config:
+        click.echo("没有配置文件")
+        return
+
+    # 从配置文件中读取 server 配置， host 和 port
+    config_info = read_config(config)
+
+    host = config_info.get("server", {}).get("host")
+    port = config_info.get("server", {}).get("port")
+
+    # check if host or port is null
+    if not host or not port:
+        logger.echo("host or port is null", "error")
+        click.echo("host or port is null")
+        return
+
+    # Start the http server
+    http_process(config, host, port)
+
+    # Print and log
+    logger.echo("Started")
+    click.echo("Started")
+
+
+@cli.command()
+def stop():
+    # get logger
+    logger = Log("delibird")
+
+    # print and log
+    logger.echo("Stopping...")
+    click.echo("Stopping...")
+
+    # kill the process
+    kill_process()
+
+    # log and close
+    logger.echo("Stopped")
+    click.echo("Stopped")
+
+
+def check_process(process_name):
+    result = subprocess.run(
+        ["pgrep", "-f", process_name], capture_output=True, text=True
+    )
+
+    # 如果pgrep命令的输出不是空的，则有匹配的进程正在运行
+    return bool(result.stdout.strip())

src/delibird/log.py

@@ -53,7 +53,7 @@ def __init__(self, name, level=LogLevel.DEBUG):
         console_handler.setFormatter(formatter)
 
         # 创建文件处理器并设置日志文件路径
-        log_file_path = get_log_path("llmproxy")
+        log_file_path = get_log_path("delibird")
         file_handler = logging.FileHandler(log_file_path)
         file_handler.setFormatter(formatter)
 

src/delibird/mock/__init__.py

@@ -1,4 +1,4 @@
-from llmproxy.mock.send import send_mock
+from delibird.mock.send import send_mock
 
 
 __all__ = ["send_mock"]

src/delibird/pm.py

@@ -3,12 +3,12 @@
 import os
 import subprocess
 from multiprocessing import Process, cpu_count
-from llmproxy.config import read_config
+from delibird.config import read_config
 
 
 def kill_process():
-    # Kill process named 'llmproxy' if it exists
-    os.system("pkill -f llmproxy")
+    # Kill process named 'delibird' if it exists
+    os.system("pkill -f delibird")
 
 
 def http_process(config_file, host, port):
@@ -26,7 +26,7 @@ def http_process(config_file, host, port):
         "uvicorn.workers.UvicornWorker",
         "-b",
         f"{host}:{port}",
-        "llmproxy.server:app",
+        "delibird.server:app",
         "--timeout",
         "60",
     ]

src/delibird/router/__init__.py

@@ -1,4 +1,4 @@
-from llmproxy.router.spark import send as spark_send
-from llmproxy.router.qwen import send as qwen_send
+from delibird.router.spark import send as spark_send
+from delibird.router.qwen import send as qwen_send
 
 __all__ = ["spark_send", "qwen_send"]

src/delibird/router/qwen.py

@@ -4,7 +4,7 @@
 from fastapi.responses import StreamingResponse
 from http import HTTPStatus
 import dashscope
-from llmproxy.log import Log
+from delibird.log import Log
 
 
 class Qwen:
@@ -33,7 +33,7 @@ def read_config(self, config, request):
             request: 请求参数.格式为 {"chat": messages, "model": "v15"}
         """
 
-        logger = Log("llmproxy")
+        logger = Log("delibird")
         # 检查配置文件和模型是否存在
         if not config:
             logger.echo("配置文件不存在", "error")
@@ -101,7 +101,7 @@ async def send(self, chunk_size=24):
 
 def send(config, request):
     """发送处理."""
-    logger = Log("llmproxy")
+    logger = Log("delibird")
 
     # 创建 Qwen 实例
     qwen = Qwen()

src/delibird/router/spark.py

@@ -15,10 +15,10 @@
 import websocket
 from wsgiref.handlers import format_date_time
 from fastapi.responses import StreamingResponse
-from llmproxy.log import Log
+from delibird.log import Log
 from time import sleep
 import asyncio
-from llmproxy.stream import WsStream
+from delibird.stream import WsStream
 
 
 class Spark:
@@ -39,7 +39,7 @@ def read_config(self):
             config: 配置文件
             request: 请求参数.格式为 {"chat": messages, "model": "v15"}
         """
-        logger = Log("llmproxy")
+        logger = Log("delibird")
         if not self.config:
             logger.echo("配置文件不存在", "error")
             return False

src/delibird/server.py

@@ -6,9 +6,9 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
-from llmproxy.router import spark_send, qwen_send
-from llmproxy.config import read_config
-from llmproxy.log import Log
+from delibird.router import spark_send, qwen_send
+from delibird.config import read_config
+from delibird.log import Log
 
 
 app = FastAPI()

src/delibird/stream/wsstream.py

@@ -1,5 +1,5 @@
 from .base import StreamBase
-from llmproxy.log import Log
+from delibird.log import Log
 import websocket
 import json
 
@@ -29,7 +29,7 @@ def close(self):
 
     async def _spark_send(self, messages, model, app_id):
         """星火大模型发送处理."""
-        logger = Log("llmproxy")
+        logger = Log("delibird")
         websocket.enableTrace(False)
 
         self.websocket = websocket.create_connection(self.url)

tests/test_config.py

@@ -1,4 +1,4 @@
-from llmproxy.config import read_config
+from delibird.config import read_config
 
 
 def test_config():