hyperzlib
/
isekai-toolkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新一些接口命名

Browse Source
master
落雨楓 2 years ago
parent 7a2948fbca
commit 1d898a6c1f
6 changed files with 86 additions and 46 deletions
Show Stats Download Patch File Download Diff File

8
api/controller/ChatComplete.py
Unescape Escape View File

@ -60,7 +60,7 @@ class ChatCompleteTask:
self.transatcion_id: Optional[str] = None self.transatcion_id: Optional[str] = None
self.point_cost: int = 0 self.point_cost: int = 0
if not self.is_system: if not self.is_system:
usage_res = await self.mwapi.chat_complete_start_transaction(self.user_id, "chatcomplete", usage_res = await self.mwapi.ai_toolbox_start_transaction(self.user_id, "chatcomplete",
question_tokens, extract_limit) question_tokens, extract_limit)
self.transatcion_id = usage_res["transaction_id"] self.transatcion_id = usage_res["transaction_id"]
self.point_cost = usage_res["point_cost"] self.point_cost = usage_res["point_cost"]
@ -109,7 +109,7 @@ class ChatCompleteTask:
self.result = chat_res self.result = chat_res
if self.transatcion_id: if self.transatcion_id:
await self.mwapi.chat_complete_end_transaction(self.transatcion_id, chat_res["total_tokens"]) await self.mwapi.ai_toolbox_end_transaction(self.transatcion_id, chat_res["total_tokens"])
await self._on_finished() await self._on_finished()
except Exception as e: except Exception as e:
@ -119,7 +119,7 @@ class ChatCompleteTask:
traceback.print_exc() traceback.print_exc()
if self.transatcion_id: if self.transatcion_id:
await self.mwapi.chat_complete_cancel_transaction(self.transatcion_id, error=err_msg) await self.mwapi.ai_toolbox_cancel_transaction(self.transatcion_id, error=err_msg)
await self._on_error(e) await self._on_error(e)
finally: finally:
@ -282,7 +282,7 @@ class ChatComplete:
tokens = await tiktoken.get_tokens(question) tokens = await tiktoken.get_tokens(question)
try: try:
res = await mwapi.chat_complete_get_point_cost(user_id, "chatcomplete", tokens, extract_limit) res = await mwapi.ai_toolbox_get_point_cost(user_id, "chatcomplete", tokens, extract_limit)
return await utils.web.api_response(1, { return await utils.web.api_response(1, {
"point_cost": res["point_cost"], "point_cost": res["point_cost"],
"tokens": tokens, "tokens": tokens,

24
api/controller/EmbeddingSearch.py
Unescape Escape View File

@ -31,7 +31,7 @@ class EmbeddingSearch:
if await embedding_search.should_update_page_index(): if await embedding_search.should_update_page_index():
if request.get("caller") == "user": if request.get("caller") == "user":
user_id = request.get("user") user_id = request.get("user")
usage_res = await mwapi.chat_complete_start_transaction(user_id, "embeddingpage") usage_res = await mwapi.ai_toolbox_start_transaction(user_id, "embeddingpage")
transatcion_id = usage_res.get("transaction_id") transatcion_id = usage_res.get("transaction_id")
await embedding_search.prepare_update_index() await embedding_search.prepare_update_index()
@ -52,7 +52,7 @@ class EmbeddingSearch:
}) })
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_end_transaction(transatcion_id, token_usage) await mwapi.ai_toolbox_end_transaction(transatcion_id, token_usage)
else: else:
await ws.send_json({ await ws.send_json({
'event': 'done', 'event': 'done',
@ -71,7 +71,7 @@ class EmbeddingSearch:
}, },
}) })
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_cancel_transaction(transatcion_id, error_msg) await mwapi.ai_toolbox_cancel_transaction(transatcion_id, error_msg)
except MediaWikiApiException as e: except MediaWikiApiException as e:
error_msg = "MediaWiki API error: %s" % str(e) error_msg = "MediaWiki API error: %s" % str(e)
print(error_msg, file=sys.stderr) print(error_msg, file=sys.stderr)
@ -86,7 +86,7 @@ class EmbeddingSearch:
}, },
}) })
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_cancel_transaction(transatcion_id, error_msg) await mwapi.ai_toolbox_cancel_transaction(transatcion_id, error_msg)
except EmbeddingRunningException: except EmbeddingRunningException:
error_msg = "Page index is running now" error_msg = "Page index is running now"
await ws.send_json({ await ws.send_json({
@ -98,7 +98,7 @@ class EmbeddingSearch:
}, },
}) })
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_cancel_transaction(transatcion_id, error_msg) await mwapi.ai_toolbox_cancel_transaction(transatcion_id, error_msg)
except Exception as e: except Exception as e:
error_msg = str(e) error_msg = str(e)
print(error_msg, file=sys.stderr) print(error_msg, file=sys.stderr)
@ -112,7 +112,7 @@ class EmbeddingSearch:
} }
}) })
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_cancel_transaction(transatcion_id, error_msg) await mwapi.ai_toolbox_cancel_transaction(transatcion_id, error_msg)
finally: finally:
await ws.close() await ws.close()
else: else:
@ -123,7 +123,7 @@ class EmbeddingSearch:
if await embedding_search.should_update_page_index(): if await embedding_search.should_update_page_index():
if request.get("caller") == "user": if request.get("caller") == "user":
user_id = request.get("user") user_id = request.get("user")
usage_res = await mwapi.chat_complete_start_transaction(user_id, "embeddingpage") usage_res = await mwapi.ai_toolbox_start_transaction(user_id, "embeddingpage")
transatcion_id = usage_res.get("transaction_id") transatcion_id = usage_res.get("transaction_id")
await embedding_search.prepare_update_index() await embedding_search.prepare_update_index()
@ -131,7 +131,7 @@ class EmbeddingSearch:
token_usage = await embedding_search.update_page_index() token_usage = await embedding_search.update_page_index()
if transatcion_id: if transatcion_id:
result = await mwapi.chat_complete_end_transaction(transatcion_id, token_usage) result = await mwapi.ai_toolbox_end_transaction(transatcion_id, token_usage)
return await utils.web.api_response(1, {"data_indexed": True}) return await utils.web.api_response(1, {"data_indexed": True})
else: else:
@ -139,7 +139,7 @@ class EmbeddingSearch:
except MediaWikiPageNotFoundException: except MediaWikiPageNotFoundException:
error_msg = "Page \"%s\" not found." % page_title error_msg = "Page \"%s\" not found." % page_title
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_cancel_transaction(transatcion_id, error_msg) await mwapi.ai_toolbox_cancel_transaction(transatcion_id, error_msg)
return await utils.web.api_response(-2, error={ return await utils.web.api_response(-2, error={
"code": "page-not-found", "code": "page-not-found",
@ -153,7 +153,7 @@ class EmbeddingSearch:
traceback.print_exc() traceback.print_exc()
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_cancel_transaction(transatcion_id, error_msg) await mwapi.ai_toolbox_cancel_transaction(transatcion_id, error_msg)
return await utils.web.api_response(-3, error={ return await utils.web.api_response(-3, error={
"code": "mediawiki-api-error", "code": "mediawiki-api-error",
@ -164,7 +164,7 @@ class EmbeddingSearch:
error_msg = "Page index is running now" error_msg = "Page index is running now"
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_cancel_transaction(transatcion_id, error_msg) await mwapi.ai_toolbox_cancel_transaction(transatcion_id, error_msg)
return await utils.web.api_response(-4, error={ return await utils.web.api_response(-4, error={
"code": "page-index-running", "code": "page-index-running",
@ -177,7 +177,7 @@ class EmbeddingSearch:
traceback.print_exc() traceback.print_exc()
if transatcion_id: if transatcion_id:
await mwapi.chat_complete_cancel_transaction(transatcion_id, error_msg) await mwapi.ai_toolbox_cancel_transaction(transatcion_id, error_msg)
return await utils.web.api_response(-1, error={ return await utils.web.api_response(-1, error={
"code": "internal-server-error", "code": "internal-server-error",

39
api/controller/Index.py
Unescape Escape View File

@ -79,6 +79,22 @@ class Index:
"code": "internal-server-error", "code": "internal-server-error",
"message": error_msg "message": error_msg
}, request=request, http_status=500) }, request=request, http_status=500)
@staticmethod
async def search_title(request: web.Request):
params = await utils.web.get_param(request, {
"kw": {
"required": True,
}
})
keyword = params.get("kw")
mwapi = MediaWikiApi.create()
search_result = await mwapi.search_title(keyword)
return await utils.web.api_response(1, {
"titles": search_result
}, request=request)
@staticmethod @staticmethod
@utils.web.token_auth @utils.web.token_auth
@ -89,7 +105,7 @@ class Index:
"type": int "type": int
}, },
"title": { "title": {
"required": True, "required": False,
}, },
"module": { "module": {
"required": False "required": False
@ -105,14 +121,18 @@ class Index:
module = params.get("module") module = params.get("module")
db = await DatabaseService.create(request.app) db = await DatabaseService.create(request.app)
async with PageTitleHelper(db) as page_title_helper, ConversationHelper(db) as conversation_helper:
page_id = await page_title_helper.get_page_id_by_title(page_title)
if page_id is None:
return await utils.web.api_response(-2, error={
"code": "page-not-found",
"message": "Page not found.",
}, request=request, http_status=404)
page_id = None
if page_title is not None:
async with PageTitleHelper(db) as page_title_helper:
page_id = await page_title_helper.get_page_id_by_title(page_title)
if page_id is None:
return await utils.web.api_response(-2, error={
"code": "page-not-found",
"message": "Page not found.",
}, request=request, http_status=404)
async with ConversationHelper(db) as conversation_helper:
conversation_list = await conversation_helper.get_conversation_list(user_id, module=module, page_id=page_id) conversation_list = await conversation_helper.get_conversation_list(user_id, module=module, page_id=page_id)
conversation_result = [] conversation_result = []
@ -121,6 +141,7 @@ class Index:
conversation_result.append({ conversation_result.append({
"id": result.id, "id": result.id,
"module": result.module, "module": result.module,
"page_title": result.page_info.title if result.page_info is not None else None,
"title": result.title, "title": result.title,
"description": result.description, "description": result.description,
"thumbnail": result.thumbnail, "thumbnail": result.thumbnail,
@ -319,7 +340,7 @@ class Index:
mwapi = MediaWikiApi.create() mwapi = MediaWikiApi.create()
try: try:
user_info = await mwapi.chat_complete_user_info(user_id) user_info = await mwapi.ai_toolbox_get_user_info(user_id)
return await utils.web.api_response(1, user_info, request=request) return await utils.web.api_response(1, user_info, request=request)
except MediaWikiPageNotFoundException as e: except MediaWikiPageNotFoundException as e:
return await utils.web.api_response(-2, error={ return await utils.web.api_response(-2, error={

8
api/model/toolkit_ui/conversation.py
Unescape Escape View File

@ -4,9 +4,10 @@ import time
from typing import List, Optional from typing import List, Optional
import sqlalchemy import sqlalchemy
from sqlalchemy import update from sqlalchemy import update
from sqlalchemy.orm import mapped_column, Mapped from sqlalchemy.orm import mapped_column, relationship, Mapped
from api.model.base import BaseModel from api.model.base import BaseModel
from api.model.toolkit_ui.page_title import PageTitleModel
from service.database import DatabaseService from service.database import DatabaseService
@ -19,14 +20,15 @@ class ConversationModel(BaseModel):
title: Mapped[str] = mapped_column(sqlalchemy.String(255), nullable=True) title: Mapped[str] = mapped_column(sqlalchemy.String(255), nullable=True)
thumbnail: Mapped[str] = mapped_column(sqlalchemy.Text(), nullable=True) thumbnail: Mapped[str] = mapped_column(sqlalchemy.Text(), nullable=True)
description: Mapped[str] = mapped_column(sqlalchemy.Text(), nullable=True) description: Mapped[str] = mapped_column(sqlalchemy.Text(), nullable=True)
page_id: Mapped[int] = mapped_column( page_id: Mapped[int] = mapped_column(sqlalchemy.ForeignKey("toolkit_ui_page_title.page_id"), index=True, nullable=True)
sqlalchemy.Integer, index=True, nullable=True)
rev_id: Mapped[int] = mapped_column(sqlalchemy.Integer, nullable=True) rev_id: Mapped[int] = mapped_column(sqlalchemy.Integer, nullable=True)
updated_at: Mapped[int] = mapped_column(sqlalchemy.BigInteger, index=True) updated_at: Mapped[int] = mapped_column(sqlalchemy.BigInteger, index=True)
pinned: Mapped[bool] = mapped_column( pinned: Mapped[bool] = mapped_column(
sqlalchemy.Boolean, default=False, index=True) sqlalchemy.Boolean, default=False, index=True)
extra: Mapped[dict] = mapped_column(sqlalchemy.JSON, default={}) extra: Mapped[dict] = mapped_column(sqlalchemy.JSON, default={})
page_info: Mapped[PageTitleModel] = relationship("PageTitleModel", lazy="joined")
class ConversationHelper: class ConversationHelper:
def __init__(self, dbs: DatabaseService): def __init__(self, dbs: DatabaseService):

1
api/route.py
Unescape Escape View File

@ -17,6 +17,7 @@ def init(app: web.Application):
web.route('*', '/hanja/romaja/', Hanja.hanja2roma), web.route('*', '/hanja/romaja/', Hanja.hanja2roma),
web.route('*', '/title/info', Index.update_title_info), web.route('*', '/title/info', Index.update_title_info),
web.route('*', '/title/search', Index.search_title),
web.route('*', '/user/info', Index.get_user_info), web.route('*', '/user/info', Index.get_user_info),
web.route('*', '/conversation/list', Index.get_conversation_list), web.route('*', '/conversation/list', Index.get_conversation_list),
web.route('*', '/conversation/info', Index.get_conversation_info), web.route('*', '/conversation/info', Index.get_conversation_info),

52
service/mediawiki_api.py
Unescape Escape View File

@ -125,7 +125,7 @@ class MediaWikiApi:
return ret return ret
async def is_logged_in(self,): async def is_logged_in(self):
async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session: async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session:
params = { params = {
"action": "query", "action": "query",
@ -157,6 +157,10 @@ class MediaWikiApi:
return data["query"]["tokens"][token_type + "token"] return data["query"]["tokens"][token_type + "token"]
async def robot_login(self, username: str, password: str): async def robot_login(self, username: str, password: str):
if await self.is_logged_in():
self.login_time = time.time()
return True
token = await self.get_token("login") token = await self.get_token("login")
async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session: async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session:
post_data = { post_data = {
@ -173,7 +177,7 @@ class MediaWikiApi:
raise MediaWikiApiException(data["error"]["info"], data["error"]["code"]) raise MediaWikiApiException(data["error"]["info"], data["error"]["code"])
if "result" not in data["login"] or data["login"]["result"] != "Success": if "result" not in data["login"] or data["login"]["result"] != "Success":
raise MediaWikiApiException("Login failed") raise MediaWikiApiException("Login failed", data["login"]["result"])
self.login_time = time.time() self.login_time = time.time()
self.login_identity = { self.login_identity = {
@ -191,12 +195,24 @@ class MediaWikiApi:
print("刷新MW机器人账号登录状态") print("刷新MW机器人账号登录状态")
return await self.robot_login(self.login_identity["username"], self.login_identity["password"]) return await self.robot_login(self.login_identity["username"], self.login_identity["password"])
async def chat_complete_user_info(self, user_id: int): async def search_title(self, keyword: str) -> list[str]:
async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session:
params = {
"action": "opensearch",
"search": keyword,
"namespace": 0,
"format": "json",
}
async with session.get(self.api_url, params=params, proxy=config.REQUEST_PROXY) as resp:
data = await resp.json()
return data[1]
async def ai_toolbox_get_user_info(self, user_id: int):
await self.refresh_login() await self.refresh_login()
async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session: async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session:
params = { params = {
"action": "chatcompletebot", "action": "aitoolboxbot",
"method": "userinfo", "method": "userinfo",
"userid": user_id, "userid": user_id,
"format": "json", "format": "json",
@ -210,14 +226,14 @@ class MediaWikiApi:
else: else:
raise MediaWikiApiException(data["error"]["info"], data["error"]["code"]) raise MediaWikiApiException(data["error"]["info"], data["error"]["code"])
return data["chatcompletebot"]["userinfo"] return data["aitoolboxbot"]["userinfo"]
async def chat_complete_get_point_cost(self, user_id: int, user_action: str, tokens: Optional[int] = None, extractlines: Optional[int] = None) -> ChatCompleteGetPointUsageResponse: async def ai_toolbox_get_point_cost(self, user_id: int, user_action: str, tokens: Optional[int] = None, extractlines: Optional[int] = None) -> ChatCompleteGetPointUsageResponse:
await self.refresh_login() await self.refresh_login()
async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session: async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session:
post_data = { post_data = {
"action": "chatcompletebot", "action": "aitoolboxbot",
"method": "reportusage", "method": "reportusage",
"step": "check", "step": "check",
"userid": int(user_id) if user_id is not None else None, "userid": int(user_id) if user_id is not None else None,
@ -235,15 +251,15 @@ class MediaWikiApi:
print(data) print(data)
raise MediaWikiApiException(data["error"]["info"], data["error"]["code"]) raise MediaWikiApiException(data["error"]["info"], data["error"]["code"])
point_cost = int(data["chatcompletebot"]["reportusage"]["pointcost"] or 0) point_cost = int(data["aitoolboxbot"]["reportusage"]["pointcost"] or 0)
return ChatCompleteGetPointUsageResponse(point_cost=point_cost) return ChatCompleteGetPointUsageResponse(point_cost=point_cost)
async def chat_complete_start_transaction(self, user_id: int, user_action: str, tokens: Optional[int] = None, extractlines: Optional[int] = None) -> ChatCompleteReportUsageResponse: async def ai_toolbox_start_transaction(self, user_id: int, user_action: str, tokens: Optional[int] = None, extractlines: Optional[int] = None) -> ChatCompleteReportUsageResponse:
await self.refresh_login() await self.refresh_login()
async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session: async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session:
post_data = { post_data = {
"action": "chatcompletebot", "action": "aitoolboxbot",
"method": "reportusage", "method": "reportusage",
"step": "start", "step": "start",
"userid": int(user_id) if user_id is not None else None, "userid": int(user_id) if user_id is not None else None,
@ -263,17 +279,17 @@ class MediaWikiApi:
else: else:
raise MediaWikiApiException(data["error"]["info"], data["error"]["code"]) raise MediaWikiApiException(data["error"]["info"], data["error"]["code"])
point_cost = int(data["chatcompletebot"]["reportusage"]["pointcost"] or 0) point_cost = int(data["aitoolboxbot"]["reportusage"]["pointcost"] or 0)
return ChatCompleteReportUsageResponse(point_cost=point_cost, return ChatCompleteReportUsageResponse(point_cost=point_cost,
transaction_id=data["chatcompletebot"]["reportusage"]["transactionid"]) transaction_id=data["aitoolboxbot"]["reportusage"]["transactionid"])
async def chat_complete_end_transaction(self, transaction_id: str, tokens: Optional[int] = None): async def ai_toolbox_end_transaction(self, transaction_id: str, tokens: Optional[int] = None):
await self.refresh_login() await self.refresh_login()
try: try:
async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session: async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session:
post_data = { post_data = {
"action": "chatcompletebot", "action": "aitoolboxbot",
"method": "reportusage", "method": "reportusage",
"step": "end", "step": "end",
"transactionid": transaction_id, "transactionid": transaction_id,
@ -288,17 +304,17 @@ class MediaWikiApi:
if "error" in data: if "error" in data:
raise MediaWikiApiException(data["error"]["info"], data["error"]["code"]) raise MediaWikiApiException(data["error"]["info"], data["error"]["code"])
return data["chatcompletebot"]["reportusage"]["success"] return data["aitoolboxbot"]["reportusage"]["success"]
except Exception as e: except Exception as e:
print(e, file=sys.stderr) print(e, file=sys.stderr)
async def chat_complete_cancel_transaction(self, transaction_id: str, error: Optional[str] = None): async def ai_toolbox_cancel_transaction(self, transaction_id: str, error: Optional[str] = None):
await self.refresh_login() await self.refresh_login()
try: try:
async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session: async with aiohttp.ClientSession(cookie_jar=self.cookie_jar) as session:
post_data = { post_data = {
"action": "chatcompletebot", "action": "aitoolboxbot",
"method": "reportusage", "method": "reportusage",
"step": "cancel", "step": "cancel",
"transactionid": transaction_id, "transactionid": transaction_id,
@ -313,6 +329,6 @@ class MediaWikiApi:
if "error" in data: if "error" in data:
raise MediaWikiApiException(data["error"]["info"], data["error"]["code"]) raise MediaWikiApiException(data["error"]["info"], data["error"]["code"])
return data["chatcompletebot"]["reportusage"]["success"] return data["aitoolboxbot"]["reportusage"]["success"]
except Exception as e: except Exception as e:
print(e, file=sys.stderr) print(e, file=sys.stderr)
Write Preview
Loading…
Cancel
Save