Unverified Commit 59ba46d2 authored by Yeuoly's avatar Yeuoly

fix: sse

parent 3b55dc08
...@@ -4,4 +4,4 @@ from libs.external_api import ExternalApi ...@@ -4,4 +4,4 @@ from libs.external_api import ExternalApi
bp = Blueprint('inner_api', __name__, url_prefix='/inner/api') bp = Blueprint('inner_api', __name__, url_prefix='/inner/api')
api = ExternalApi(bp) api = ExternalApi(bp)
from . import authorization from . import authorization, model_runtime, app
\ No newline at end of file \ No newline at end of file
from flask_restful import Resource
from controllers.console.setup import setup_required
from controllers.inner_api import api
from controllers.inner_api.wraps import inner_api_only
class EnterpriseModelInvokeApi(Resource):
"""Model invoke API for enterprise edition"""
@setup_required
@inner_api_only
def post(self):
pass
api.add_resource(EnterpriseModelInvokeApi, '/model/invoke')
\ No newline at end of file
import json
from collections.abc import Generator from collections.abc import Generator
from typing import Optional, Union, cast from typing import Optional, Union, cast
...@@ -92,9 +94,9 @@ class ModelRunner: ...@@ -92,9 +94,9 @@ class ModelRunner:
usage.currency = chunk.delta.usage.currency usage.currency = chunk.delta.usage.currency
yield jsonable_encoder(chunk) yield 'data: ' + json.dumps(jsonable_encoder(chunk)) + '\n\n'
model_was_invoked( model_was_invoked.send(
None, None,
tenant_id=tenant_id, tenant_id=tenant_id,
model_config={ model_config={
...@@ -118,7 +120,7 @@ class ModelRunner: ...@@ -118,7 +120,7 @@ class ModelRunner:
""" """
usage = response.usage or LLMUsage.empty_usage() usage = response.usage or LLMUsage.empty_usage()
model_was_invoked( model_was_invoked.send(
None, None,
tenant_id=tenant_id, tenant_id=tenant_id,
model_config={ model_config={
......
...@@ -339,7 +339,7 @@ class CompletionService: ...@@ -339,7 +339,7 @@ class CompletionService:
raise QuotaExceededError(f"Model provider {provider} quota exceeded.") raise QuotaExceededError(f"Model provider {provider} quota exceeded.")
converted_tools = [] converted_tools = []
for tool in tools: for tool in tools or []:
converted_tools.append(PromptMessageTool( converted_tools.append(PromptMessageTool(
name=tool['name'], name=tool['name'],
description=tool['description'], description=tool['description'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment