bizyengine 1.2.26__py3-none-any.whl → 1.2.27__py3-none-any.whl

bizyengine/bizy_server/api_client.py

@@ -1122,9 +1122,11 @@ class APIClient:
             print(f"\033[31m[BizyAir]\033[0m Fail to get recent cost: {str(e)}")
             return None, errnos.GET_RECENT_COST
 
-    def forward_model_request(self, request_data):
+    def forward_model_request(self, request_data, request_api_key):
         try:
-            api_key = get_api_key()
+            api_key = request_api_key
+            if not BIZYAIR_SERVER_MODE:
+                api_key = get_api_key()
             if not api_key:
                 return None, errnos.INVALID_API_KEY
 
@@ -1170,9 +1172,11 @@ class APIClient:
             print(f"\033[31m[BizyAir]\033[0m Model API forwarding failed: {str(e)}")
             return None, errnos.MODEL_API_ERROR
 
-    async def forward_image_request(self, request_data):
+    async def forward_image_request(self, request_data, request_api_key):
         try:
-            api_key = get_api_key()
+            api_key = request_api_key
+            if not BIZYAIR_SERVER_MODE:
+                api_key = get_api_key()
             if not api_key:
                 return None, errnos.INVALID_API_KEY
             headers = {

bizyengine/bizy_server/server.py

@@ -739,6 +739,126 @@ class BizyAirServer:
                 err.data = {"error": valid[1], "node_errors": valid[3]}
                 return ErrResponse(err)
 
+        @self.prompt_server.routes.post(f"/{MODEL_API}/chat")
+        async def chat_completions(request):
+            request_api_key, err = _get_request_api_key(request.headers)
+            if err:
+                return ErrResponse(err)
+
+            response = None  # 确保变量在退出前定义
+            resp = None  # 响应对象引用
+            req_id = f"req-{id(request)}"  # 为请求生成唯一ID
+
+            try:
+                # 解析请求数据
+                request_data = await request.json()
+
+                # 转发请求到模型服务
+                with self.api_client.forward_model_request(
+                    request_data, request_api_key
+                ) as response:
+                    # 创建并准备流式响应
+                    resp = aiohttp.web.StreamResponse(
+                        status=200,
+                        reason="OK",
+                        headers={
+                            "Content-Type": "text/event-stream",
+                            "Cache-Control": "no-cache",
+                            "Connection": "keep-alive",
+                            "X-Accel-Buffering": "no",  # 禁用Nginx缓冲
+                        },
+                    )
+                    await resp.prepare(request)
+
+                    # 开始流式传输
+                    any_chunk_sent = False  # 跟踪是否发送了任何数据块
+                    try:
+                        for bytes in response.iter_bytes(1024):
+                            if bytes:
+                                await resp.write(bytes)
+                                any_chunk_sent = True
+                                await resp.drain()  # 确保数据被立即发送
+                    except Exception as e:
+                        print(
+                            f"\033[31m[聊天请求-{req_id}]\033[0m 流式传输错误: {str(e)}"
+                        )
+                        # 如果尚未发送任何数据块，尝试发送错误信息
+                        if not any_chunk_sent and not resp.prepared:
+                            return ErrResponse(errnos.MODEL_API_ERROR)
+                        elif not any_chunk_sent:
+                            try:
+                                error_msg = json.dumps(
+                                    {"error": f"流式传输错误: {str(e)}"}
+                                )
+                                await resp.write(
+                                    f"data: {error_msg}\n\n".encode("utf-8")
+                                )
+                                await resp.write(b"data: [DONE]\n\n")
+                            except Exception as write_err:
+                                print(
+                                    f"\033[31m[聊天请求-{req_id}]\033[0m 写入错误消息时出错: {str(write_err)}"
+                                )
+
+                    try:
+                        await resp.write_eof()
+                    except Exception as e:
+                        print(
+                            f"\033[31m[聊天请求-{req_id}]\033[0m 结束响应时出错: {str(e)}"
+                        )
+
+                    return resp
+
+            except openai.APIConnectionError as e:
+                print("The server could not be reached")
+                print(
+                    e.__cause__
+                )  # an underlying Exception, likely raised within httpx.
+            except openai.RateLimitError:
+                print("A 429 status code was received; we should back off a bit.")
+            except openai.APIStatusError as e:
+                print("Another non-200-range status code was received")
+                print(e.status_code)
+                print(e.response)
+            except Exception as e:
+                print(
+                    f"\033[31m[聊天请求-{req_id}]\033[0m 处理请求时发生错误: {str(e)}"
+                )
+                # 如果响应已经准备好，尝试发送错误信息
+                if resp and resp.prepared:
+                    try:
+                        error_msg = json.dumps({"error": f"服务器错误: {str(e)}"})
+                        await resp.write(f"data: {error_msg}\n\n".encode("utf-8"))
+                        await resp.write(b"data: [DONE]\n\n")
+                        await resp.write_eof()
+                    except:
+                        pass
+                    return resp
+
+                return ErrResponse(errnos.MODEL_API_ERROR)
+
+        @self.prompt_server.routes.post(f"/{MODEL_API}/images")
+        async def image_generations(request):
+            try:
+                request_api_key, err = _get_request_api_key(request.headers)
+                if err:
+                    return ErrResponse(err)
+
+                # 解析请求数据
+                request_data = await request.json()
+
+                # 转发图像生成请求
+                result, err = await self.api_client.forward_image_request(
+                    request_data, request_api_key
+                )
+                if err is not None:
+                    return ErrResponse(err)
+
+                # 返回结果
+                return OKResponse(result)
+
+            except Exception:
+                return ErrResponse(errnos.MODEL_API_ERROR)
+
         # 服务器模式独占
         if BIZYAIR_SERVER_MODE:
             return
@@ -1129,114 +1249,6 @@ class BizyAirServer:
 
             return OKResponse(resp)
 
-        @self.prompt_server.routes.post(f"/{MODEL_API}/chat")
-        async def chat_completions(request):
-            response = None  # 确保变量在退出前定义
-            resp = None  # 响应对象引用
-            req_id = f"req-{id(request)}"  # 为请求生成唯一ID
-
-            try:
-                # 解析请求数据
-                request_data = await request.json()
-
-                # 转发请求到模型服务
-                with self.api_client.forward_model_request(request_data) as response:
-                    # 创建并准备流式响应
-                    resp = aiohttp.web.StreamResponse(
-                        status=200,
-                        reason="OK",
-                        headers={
-                            "Content-Type": "text/event-stream",
-                            "Cache-Control": "no-cache",
-                            "Connection": "keep-alive",
-                            "X-Accel-Buffering": "no",  # 禁用Nginx缓冲
-                        },
-                    )
-                    await resp.prepare(request)
-
-                    # 开始流式传输
-                    any_chunk_sent = False  # 跟踪是否发送了任何数据块
-                    try:
-                        for bytes in response.iter_bytes(1024):
-                            if bytes:
-                                await resp.write(bytes)
-                                any_chunk_sent = True
-                                await resp.drain()  # 确保数据被立即发送
-                    except Exception as e:
-                        print(
-                            f"\033[31m[聊天请求-{req_id}]\033[0m 流式传输错误: {str(e)}"
-                        )
-                        # 如果尚未发送任何数据块，尝试发送错误信息
-                        if not any_chunk_sent and not resp.prepared:
-                            return ErrResponse(errnos.MODEL_API_ERROR)
-                        elif not any_chunk_sent:
-                            try:
-                                error_msg = json.dumps(
-                                    {"error": f"流式传输错误: {str(e)}"}
-                                )
-                                await resp.write(
-                                    f"data: {error_msg}\n\n".encode("utf-8")
-                                )
-                                await resp.write(b"data: [DONE]\n\n")
-                            except Exception as write_err:
-                                print(
-                                    f"\033[31m[聊天请求-{req_id}]\033[0m 写入错误消息时出错: {str(write_err)}"
-                                )
-
-                    try:
-                        await resp.write_eof()
-                    except Exception as e:
-                        print(
-                            f"\033[31m[聊天请求-{req_id}]\033[0m 结束响应时出错: {str(e)}"
-                        )
-
-                    return resp
-
-            except openai.APIConnectionError as e:
-                print("The server could not be reached")
-                print(
-                    e.__cause__
-                )  # an underlying Exception, likely raised within httpx.
-            except openai.RateLimitError:
-                print("A 429 status code was received; we should back off a bit.")
-            except openai.APIStatusError as e:
-                print("Another non-200-range status code was received")
-                print(e.status_code)
-                print(e.response)
-            except Exception as e:
-                print(
-                    f"\033[31m[聊天请求-{req_id}]\033[0m 处理请求时发生错误: {str(e)}"
-                )
-                # 如果响应已经准备好，尝试发送错误信息
-                if resp and resp.prepared:
-                    try:
-                        error_msg = json.dumps({"error": f"服务器错误: {str(e)}"})
-                        await resp.write(f"data: {error_msg}\n\n".encode("utf-8"))
-                        await resp.write(b"data: [DONE]\n\n")
-                        await resp.write_eof()
-                    except:
-                        pass
-                    return resp
-
-                return ErrResponse(errnos.MODEL_API_ERROR)
-
-        @self.prompt_server.routes.post(f"/{MODEL_API}/images")
-        async def image_generations(request):
-            try:
-                # 解析请求数据
-                request_data = await request.json()
-
-                # 转发图像生成请求
-                result, err = await self.api_client.forward_image_request(request_data)
-                if err is not None:
-                    return ErrResponse(err)
-
-                # 返回结果
-                return OKResponse(result)
-
-            except Exception:
-                return ErrResponse(errnos.MODEL_API_ERROR)
-
     async def send_json(self, event, data, sid=None):
         message = {"type": event, "data": data}
 

bizyengine/version.txt

@@ -1 +1 @@
-1.2.26
+1.2.27

{bizyengine-1.2.26.dist-info → bizyengine-1.2.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizyengine
-Version: 1.2.26
+Version: 1.2.27
 Summary: [a/BizyAir](https://github.com/siliconflow/BizyAir) Comfy Nodes that can run in any environment.
 Author-email: SiliconFlow <yaochi@siliconflow.cn>
 Project-URL: Repository, https://github.com/siliconflow/BizyAir

{bizyengine-1.2.26.dist-info → bizyengine-1.2.27.dist-info}/RECORD

@@ -1,13 +1,13 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=XmSQdL2rcd2Ni6nWmucswtJ_1MSf4wAxT_j0jRYjkdU,7
+bizyengine/version.txt,sha256=hPsbIxO28ragdKYMcOjrjXZov_fwllVD_xQUQMCih60,6
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
-bizyengine/bizy_server/api_client.py,sha256=qY1hQ11AeDf5m647qrYvn3YPBzP6Yaw8n2Z9hTk5Wtg,43624
+bizyengine/bizy_server/api_client.py,sha256=t6cwob7hs993oy5WdFcjKtIzfi3S_eUhODdDVv_Hedo,43822
 bizyengine/bizy_server/errno.py,sha256=Q-U96XnZQCuPH_44Om8wnc2-Kh7qFqwLKtox27msU54,16095
 bizyengine/bizy_server/error_handler.py,sha256=MGrfO1AEqbfEgMWPL8B6Ypew_zHiQAdYGlhN9bZohrY,167
 bizyengine/bizy_server/execution.py,sha256=ayaEf6eGJKQsVZV-1_UlGlvwwmlH7FEek31Uq-MbUjA,1644
 bizyengine/bizy_server/profile.py,sha256=f4juAzJ73gCm0AhagYpt9WnG8HEI6xze_U96-omBLqU,3044
 bizyengine/bizy_server/resp.py,sha256=iOFT5Ud7VJBP2uqkojJIgc3y2ifMjjEXoj0ewneL9lc,710
-bizyengine/bizy_server/server.py,sha256=XWGO8gdTtIgwTO_WQNEYOumBVVN4SUYqohKmKmwFe0o,53130
+bizyengine/bizy_server/server.py,sha256=9zCDdtK-0FwA6VYCBhrur99WQs2geNvA2jlfncMnSj0,53520
 bizyengine/bizy_server/stream_response.py,sha256=H2XHqlVRtQMhgdztAuG7l8-iV_Pm42u2x6WJ0gNVIW0,9654
 bizyengine/bizy_server/utils.py,sha256=CIoRrCy8Wv4D9FDdr_QtNP03AjWw8M6GSm2QcrVJl6Y,3739
 bizyengine/bizyair_extras/__init__.py,sha256=EjyLEdLpPm5I4Z25YmnoK4PYQDmsEyXtCXQt9UDGmi0,1009
@@ -77,7 +77,7 @@ bizyengine/misc/route_sam.py,sha256=-bMIR2QalfnszipGxSxvDAHGJa5gPSrjkYPb5baaRg4,
 bizyengine/misc/segment_anything.py,sha256=wNKYwlYPMszfwj23524geFZJjZaG4eye65SGaUnh77I,8941
 bizyengine/misc/supernode.py,sha256=STN9gaxfTSErH8OiHeZa47d8z-G9S0I7fXuJvHQOBFM,4532
 bizyengine/misc/utils.py,sha256=deQjBgLAkxIr-NaOMm77TcgBT3ExAp0MFm5ehUJ3CGs,6829
-bizyengine-1.2.26.dist-info/METADATA,sha256=MFyKRe1Yh8HQLoRl2UB3Ass0xyMfd27yUsGx0Yqphmc,675
-bizyengine-1.2.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.26.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.26.dist-info/RECORD,,
+bizyengine-1.2.27.dist-info/METADATA,sha256=ok50MkdSb5QqGRuIQMF7dR44VipfqVZKqm1RzZcAWaU,675
+bizyengine-1.2.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.27.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.27.dist-info/RECORD,,