mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-08-10 05:00:59 +00:00
style: introduce ruff as linter and formatter (#1356)
* style: remove necessary imports * style: fix F841 * style: fix F401 * style: fix F811 * style: fix E402 * style: fix E721 * style: fix E722 * style: fix E722 * style: fix F541 * style: ruff format * style: all passed * style: add ruff in deps * style: more ignores in ruff.toml * style: add pre-commit
This commit is contained in:
Junyan Qin (Chin)
committed by
GitHub
GitHub
parent
09e70d70e9
commit
209f16af76
@@ -6,18 +6,15 @@ import typing
|
||||
from typing import Union, Mapping, Any, AsyncIterator
|
||||
import uuid
|
||||
import json
|
||||
import base64
|
||||
|
||||
import async_lru
|
||||
import ollama
|
||||
|
||||
from .. import entities, errors, requester
|
||||
from .. import errors, requester
|
||||
from ... import entities as llm_entities
|
||||
from ...tools import entities as tools_entities
|
||||
from ....core import app, entities as core_entities
|
||||
from ....utils import image
|
||||
from ....core import entities as core_entities
|
||||
|
||||
REQUESTER_NAME: str = "ollama-chat"
|
||||
REQUESTER_NAME: str = 'ollama-chat'
|
||||
|
||||
|
||||
class OllamaChatCompletions(requester.LLMAPIRequester):
|
||||
@@ -26,13 +23,13 @@ class OllamaChatCompletions(requester.LLMAPIRequester):
|
||||
client: ollama.AsyncClient
|
||||
|
||||
default_config: dict[str, typing.Any] = {
|
||||
"base_url": "http://127.0.0.1:11434",
|
||||
"timeout": 120,
|
||||
'base_url': 'http://127.0.0.1:11434',
|
||||
'timeout': 120,
|
||||
}
|
||||
|
||||
async def initialize(self):
|
||||
os.environ["OLLAMA_HOST"] = self.requester_cfg["base_url"]
|
||||
self.client = ollama.AsyncClient(timeout=self.requester_cfg["timeout"])
|
||||
os.environ['OLLAMA_HOST'] = self.requester_cfg['base_url']
|
||||
self.client = ollama.AsyncClient(timeout=self.requester_cfg['timeout'])
|
||||
|
||||
async def _req(
|
||||
self,
|
||||
@@ -49,35 +46,35 @@ class OllamaChatCompletions(requester.LLMAPIRequester):
|
||||
extra_args: dict[str, typing.Any] = {},
|
||||
) -> llm_entities.Message:
|
||||
args = extra_args.copy()
|
||||
args["model"] = use_model.model_entity.name
|
||||
args['model'] = use_model.model_entity.name
|
||||
|
||||
messages: list[dict] = req_messages.copy()
|
||||
for msg in messages:
|
||||
if "content" in msg and isinstance(msg["content"], list):
|
||||
if 'content' in msg and isinstance(msg['content'], list):
|
||||
text_content: list = []
|
||||
image_urls: list = []
|
||||
for me in msg["content"]:
|
||||
if me["type"] == "text":
|
||||
text_content.append(me["text"])
|
||||
elif me["type"] == "image_base64":
|
||||
image_urls.append(me["image_base64"])
|
||||
for me in msg['content']:
|
||||
if me['type'] == 'text':
|
||||
text_content.append(me['text'])
|
||||
elif me['type'] == 'image_base64':
|
||||
image_urls.append(me['image_base64'])
|
||||
|
||||
msg["content"] = "\n".join(text_content)
|
||||
msg["images"] = [url.split(",")[1] for url in image_urls]
|
||||
msg['content'] = '\n'.join(text_content)
|
||||
msg['images'] = [url.split(',')[1] for url in image_urls]
|
||||
if (
|
||||
"tool_calls" in msg
|
||||
'tool_calls' in msg
|
||||
): # LangBot 内部以 str 存储 tool_calls 的参数，这里需要转换为 dict
|
||||
for tool_call in msg["tool_calls"]:
|
||||
tool_call["function"]["arguments"] = json.loads(
|
||||
tool_call["function"]["arguments"]
|
||||
for tool_call in msg['tool_calls']:
|
||||
tool_call['function']['arguments'] = json.loads(
|
||||
tool_call['function']['arguments']
|
||||
)
|
||||
args["messages"] = messages
|
||||
args['messages'] = messages
|
||||
|
||||
args["tools"] = []
|
||||
args['tools'] = []
|
||||
if user_funcs:
|
||||
tools = await self.ap.tool_mgr.generate_tools_for_openai(user_funcs)
|
||||
if tools:
|
||||
args["tools"] = tools
|
||||
args['tools'] = tools
|
||||
|
||||
resp = await self._req(args)
|
||||
message: llm_entities.Message = await self._make_msg(resp)
|
||||
@@ -93,7 +90,7 @@ class OllamaChatCompletions(requester.LLMAPIRequester):
|
||||
ret_msg: llm_entities.Message = None
|
||||
|
||||
if message.content is not None:
|
||||
ret_msg = llm_entities.Message(role="assistant", content=message.content)
|
||||
ret_msg = llm_entities.Message(role='assistant', content=message.content)
|
||||
if message.tool_calls is not None and len(message.tool_calls) > 0:
|
||||
tool_calls: list[llm_entities.ToolCall] = []
|
||||
|
||||
@@ -101,7 +98,7 @@ class OllamaChatCompletions(requester.LLMAPIRequester):
|
||||
tool_calls.append(
|
||||
llm_entities.ToolCall(
|
||||
id=uuid.uuid4().hex,
|
||||
type="function",
|
||||
type='function',
|
||||
function=llm_entities.FunctionCall(
|
||||
name=tool_call.function.name,
|
||||
arguments=json.dumps(tool_call.function.arguments),
|
||||
@@ -123,13 +120,13 @@ class OllamaChatCompletions(requester.LLMAPIRequester):
|
||||
req_messages: list = []
|
||||
for m in messages:
|
||||
msg_dict: dict = m.dict(exclude_none=True)
|
||||
content: Any = msg_dict.get("content")
|
||||
content: Any = msg_dict.get('content')
|
||||
if isinstance(content, list):
|
||||
if all(
|
||||
isinstance(part, dict) and part.get("type") == "text"
|
||||
isinstance(part, dict) and part.get('type') == 'text'
|
||||
for part in content
|
||||
):
|
||||
msg_dict["content"] = "\n".join(part["text"] for part in content)
|
||||
msg_dict['content'] = '\n'.join(part['text'] for part in content)
|
||||
req_messages.append(msg_dict)
|
||||
try:
|
||||
return await self._closure(
|
||||
@@ -140,4 +137,4 @@ class OllamaChatCompletions(requester.LLMAPIRequester):
|
||||
extra_args=extra_args,
|
||||
)
|
||||
except asyncio.TimeoutError:
|
||||
raise errors.RequesterError("请求超时")
|
||||
raise errors.RequesterError('请求超时')
|
||||
|
||||
Reference in New Issue
Block a user