update

Author: sanshanya

TempImage/readme.jpg

@@ -80,7 +80,3 @@
         }
   }
 help_msg_all = [help_msg1,help_msg2,help_msg3,help_msg4,help_msg5]
-
-
-
-

help.py

@@ -1,56 +1,45 @@
 # AI_SETU
 
-> 2022/11/10 21:00 更新内容:以图绘图改为使用stable diffusion UI的api
->
-> 2022/10/24 20:   00 更新内容：合并今日少女插件(deemo)
->
-> 2022/10/22 23:   40 更新内容：添加help.py,拆分文件
->
-> 2022/10/22 15:   20 更新内容：使用yaml作为配置文件,拆分文件
->
-> 2022/10/21 12：30 更新内容：动漫化指令,元素魔典逻辑修改
->
-> 2022/10/18 18：56 更新内容：元素魔典原型指令,重新config.py添加轮询机制
->
-> 2022/10/17 18：55 更新内容：图片相关指令均可通过回复触发，重写config.py，重写pic超分，重写图片鉴赏
->
-> 2022/10/16 18：47 更新内容：更新pic超分相关内容，重写config.py
->
-> 2022/10/13 18：47 更新内容：把一些看着难看的函数合并到until.py，查看pic添加每页最大参数
->
-> 2022/10/11 21：47 更新内容：pic的上传，查看，点赞
+![效果图](TempImage/readme.jpg)
 
 ### **介绍**
 
-利用路路佬的API，实现HoshinoBot快速进行AI绘图。
+利用[Stable Diffusion web UI](https://github.com/AUTOMATIC1111/stable-diffusion-webui) 的api 或是路路提供的友情api来实现**HoshinoBot**快速进行AI绘图。
 
-快捷调用huggingface的仓库和开源模型
-
-### 额外依赖
-
-hjson,pyahocorasick,pyyaml
+额外提供快捷调用huggingface的某几个特定仓库和开源模型的方法
 
 ### 使用方法
 
-- 装额外依赖
+- 装额外依赖 `hjson`,`pyahocorasick`,`pyyaml`,`aiofiles`
+
+  ```
+  pip install XXX
+  ```
 - 命令行输入
 
   ```
   cp config_example.yaml config.yaml
   ```
 
-  然后自行修改 `config.yaml`
+  然后根据注释提示自行修改 `config.yaml`
 
 ### 功能
 
-* **绘图**
-* **以图绘图**
+* **(SD)绘图**
+* **(SD)以图绘图**
 * **个人/本群XP排行/缝合**
 * **上传pic**
 * **查看本群/个人/全部pic**
 * **点赞/删除pic**
 * **超分pic x倍超分 [保守/不]降噪   X为2，3，4   []内为可选参数**
 * **鉴赏图片**
 * **动漫化**
-* **元素法典吟唱**
-* **今天我是什么少女**
+* **(SD)元素法典吟唱**
+* **(SD)今天我是什么少女**
+
+前缀含有**SD**则使用[Stable Diffusion web UI](https://github.com/AUTOMATIC1111/stable-diffusion-webui) 的api
+
+无前缀默认使用路路提供的友情api
+
+
+**PS:渣代码,欢迎提出改进建议~**

readme.md

@@ -79,7 +79,7 @@ async def process_tags(gid,uid,tags,add_db=config['add_db'],trans=config['trans'
     try:
         tags = f"tags={tags.strip().lower()}" #去除首尾空格换行#转小写#头部加上tags= #转小写方便处理
         taglist = re.split('&',tags) #分割
-        id = ["tags=","ntags=","seed=","scale=","shape=","strength=","r18=","steps=","sampler=","restore_faces=","tiling="]
+        id = ["tags=","ntags=","seed=","scale=","shape=","strength=","r18=","steps=","sampler=","restore_faces=","tiling=","bigger="]
         tag_dict = {i: ("" if not [idx for idx in taglist if idx.startswith(i)] else [idx for idx in taglist if idx.startswith(i)][-1]).replace(i, '', 1)  for i in id }#取出tags+ntags+seed+scale+shape,每种只取列表最后一个,并删掉id
     except Exception as e:
         error_msg = f"tags初始化失败{e}"
@@ -141,6 +141,7 @@ async def process_tags(gid,uid,tags,add_db=config['add_db'],trans=config['trans'
         tag_dict["restore_faces="] = False#默认restore_faces
     if not tag_dict["tiling="] and tag_dict["tiling="] !=  "True":
         tag_dict["tiling="] = False#默认tiling
+    tag_dict["bigger="] = False if not tag_dict["bigger="] else True#默认bigger
     #上传XP数据库
     if add_db:
         try:
@@ -208,6 +209,8 @@ async def get_imgdata_sd(tagdict:dict,way=1,shape="Portrait",b_io=None,size = No
             width,height = 768,512
         elif shape == "Square":
             width,height = 640,640
+        if tagdict["bigger="]:
+            width,height = width+128,height+128
         url = f"{config['sd_api_ip']}/sdapi/v1/txt2img"
         json_data = {
           "enable_hr": False,
@@ -227,6 +230,15 @@ async def get_imgdata_sd(tagdict:dict,way=1,shape="Portrait",b_io=None,size = No
         url = f"{config['sd_api_ip']}/sdapi/v1/img2img"
         data = ["data:image/jpeg;base64," + base64.b64encode(b_io.getvalue()).decode()]
         width,height = size
+        if tagdict["bigger="]:
+            width,height = width*2,height*2
+        c = width/height
+        n = 1000000 #最大像素
+        if width*height > n:
+            height = math.ceil(math.sqrt(n/c))
+            width = math.ceil(c*height)
+        width = math.ceil(width/64)*64
+        height = math.ceil(height/64)*64 #等比缩放为64的倍数
         if not tagdict["strength="]:
             tagdict["strength="] = config['strength_moren']#默认噪声
         json_data = {
@@ -353,7 +365,7 @@ async def get_xp_pic_(msg,gid,uid):
 async def get_pic_d(msg):
     error_msg = ""  # 报错信息
     try:
-        image_url = re.search(r"\[CQ:image,file=(.*)url=(.*?)[,|\]]", str(msg))
+        image_url = re.search(r"\[CQ:image,file=(.*)url=(.*?)[,\];]", str(msg))
         url = image_url.group(2)
     except Exception as e:
         error_msg = "你的图片呢？"
@@ -364,12 +376,6 @@ async def get_pic_d(msg):
         a,b = image.size
         c = a/b
         s = [0.6667,1.5,1]
-        n = 1000000 #最大像素
-        if a*b > n:
-            b = math.ceil(math.sqrt(n/c))
-            a = math.ceil(c*b)
-        a = math.ceil(a/64)*64
-        b = math.ceil(b/64)*64 #等比缩放为64的倍数
         size = (a,b)
         s1 =["Portrait","Landscape","Square"]
         shape=s1[s.index(nsmallest(1, s, key=lambda x: abs(x-c))[0])]#判断形状