0.6.1

PicImageSeach/saucenao.py

@@ -1,4 +1,3 @@
-import base64
 import io
 
 import requests
@@ -135,28 +134,21 @@ def __init__(self,
         params['output_type'] = output_type
         self.params = params
 
-    @staticmethod
-    def _base_64(filename):
-        with open(filename, 'rb') as f:
-            coding = base64.b64encode(f.read())  # 读取文件内容，转换为base64编码
-            # print('本地base64转码~')
-            return coding.decode()
-
-    def _file(self, filename: io.BytesIO):
-        return filename
-
     def search(self, url: str, files=None):
-        params = self.params
-        if url[:4] == 'http':  # 网络url
-            params['url'] = url
-        else:  # 文件
-            image = Image.open(url)
-            imageData = io.BytesIO()
-            image.save(imageData, format='PNG')
-            files = {'file': ("image.png", imageData.getvalue())}
-            imageData.close()
-        resp = requests.post(self.SauceNAOURL, params=params, files=files)
-        status_code = resp.status_code
-        logger.info(status_code)
-        data = resp.json()
-        return SauceNAOResponse(data)
+        try:
+            params = self.params
+            if url[:4] == 'http':  # 网络url
+                params['url'] = url
+            else:  # 文件
+                image = Image.open(url)
+                imageData = io.BytesIO()
+                image.save(imageData, format='PNG')
+                files = {'file': ("image.png", imageData.getvalue())}
+                imageData.close()
+            resp = requests.post(self.SauceNAOURL, params=params, files=files)
+            status_code = resp.status_code
+            logger.info(status_code)
+            data = resp.json()
+            return SauceNAOResponse(data)
+        except Exception as e:
+            logger.error(e)

PicImageSeach/tracemoe.py

@@ -91,7 +91,7 @@ def preview_image(self):  # 预览
                                                                                            tokenthumb)
         return url
 
-    def preview_video(self, mute=True):
+    def preview_video(self, mute=False):
         """
         创建预览视频
         :param mute:预览视频是否静音，True为静音

requirements.txt

@@ -1,3 +1,4 @@
 requests==2.23.0
 setuptools~=50.3.0
-loguru~=0.5.3
+loguru~=0.5.3
+Pillow~=7.2.0

setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name="PicImageSearch",
-    version="0.6.0",
+    version="0.6.1",
     author="kitUIN",
     author_email="kulujun@gmail.com",
     description="PicImageSearch APIs for Python 3.x 适用于 Python 3 以图搜源整合API",

test/test1.py

@@ -1,6 +1,6 @@
 from PicImageSeach.tracemoe import TraceMoe
 tracemoe = TraceMoe()
 t = tracemoe.search('https://trace.moe/img/tinted-good.jpg')
-print(tracemoe.thumbnail)
+print(tracemoe.viedo)
 print(tracemoe.similarity)
 print(type(tracemoe.similarity))