Jarvis-Brain 0.1.11.10__tar.gz → 0.1.11.11__tar.gz

{jarvis_brain-0.1.11.10 → jarvis_brain-0.1.11.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Jarvis_Brain
-Version: 0.1.11.10
+Version: 0.1.11.11
 Summary: Jarvis brain mcp
 Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4

{jarvis_brain-0.1.11.10 → jarvis_brain-0.1.11.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Jarvis_Brain"  # 别人下载时用的名字，必须在 PyPI 上唯一
-version = "0.1.11.10"
+version = "0.1.11.11"
 description = "Jarvis brain mcp"
 dependencies = [
     "fastmcp",

{jarvis_brain-0.1.11.10 → jarvis_brain-0.1.11.11}/tools/tools.py

@@ -212,62 +212,102 @@ def btyes2Base64Img(target_byte):
     return "data:image/png;base64," + base64.b64encode(target_byte).decode()
 
 
-def compress_image_bytes(input_bytes, target_size_mb=1):
-    """
-    压缩图片字节数据到目标大小
+# def compress_image_bytes(input_bytes, target_size_mb=1):
+#     """
+#     压缩图片字节数据到目标大小
+#
+#     参数:
+#         input_bytes: 输入图片的字节数据
+#         target_size_mb: 目标大小(MB)，默认1MB
+#
+#     返回:
+#         压缩后的图片字节数据
+#     """
+#     target_size = target_size_mb * 1024 * 1024  # 转换为字节
+#
+#     # 从字节数据打开图片
+#     img = Image.open(io.BytesIO(input_bytes))
+#
+#     # 如果是PNG或其他格式，转换为RGB
+#     if img.mode in ('RGBA', 'LA', 'P'):
+#         img = img.convert('RGB')
+#
+#     # 初始质量设置
+#     quality = 95
+#
+#     # 先尝试压缩
+#     output_buffer = io.BytesIO()
+#     img.save(output_buffer, 'JPEG', quality=quality, optimize=True)
+#     output_bytes = output_buffer.getvalue()
+#
+#     # 如果文件仍然太大，逐步降低质量
+#     while len(output_bytes) > target_size and quality > 10:
+#         quality -= 5
+#         output_buffer = io.BytesIO()
+#         img.save(output_buffer, 'JPEG', quality=quality, optimize=True)
+#         output_bytes = output_buffer.getvalue()
+#
+#     # 如果降低质量还不够，尝试缩小尺寸
+#     if len(output_bytes) > target_size:
+#         width, height = img.size
+#
+#         while len(output_bytes) > target_size and quality > 10:
+#             # 缩小10%
+#             width = int(width * 0.9)
+#             height = int(height * 0.9)
+#             img_resized = img.resize((width, height), Image.Resampling.LANCZOS)
+#             output_buffer = io.BytesIO()
+#             img_resized.save(output_buffer, 'JPEG', quality=quality, optimize=True)
+#             output_bytes = output_buffer.getvalue()
+#
+#     final_size = len(output_bytes) / (1024 * 1024)
+#     # print(f"压缩完成！")
+#     # print(f"原始大小: {len(input_bytes) / (1024 * 1024):.2f}MB")
+#     # print(f"压缩后大小: {final_size:.2f}MB")
+#     # print(f"最终质量: {quality}")
+#
+#     return output_bytes
+#
 
-    参数:
-        input_bytes: 输入图片的字节数据
-        target_size_mb: 目标大小(MB)，默认1MB
 
-    返回:
-        压缩后的图片字节数据
-    """
-    target_size = target_size_mb * 1024 * 1024  # 转换为字节
 
-    # 从字节数据打开图片
-    img = Image.open(io.BytesIO(input_bytes))
+def compress_image_bytes(input_bytes, target_size_mb=1):
+    target_size = target_size_mb * 1024 * 1024
 
-    # 如果是PNG或其他格式，转换为RGB
+    img = Image.open(io.BytesIO(input_bytes))
     if img.mode in ('RGBA', 'LA', 'P'):
         img = img.convert('RGB')
 
-    # 初始质量设置
     quality = 95
-
-    # 先尝试压缩
     output_buffer = io.BytesIO()
     img.save(output_buffer, 'JPEG', quality=quality, optimize=True)
     output_bytes = output_buffer.getvalue()
 
-    # 如果文件仍然太大，逐步降低质量
+    # 1. 优先降低质量
     while len(output_bytes) > target_size and quality > 10:
         quality -= 5
         output_buffer = io.BytesIO()
         img.save(output_buffer, 'JPEG', quality=quality, optimize=True)
         output_bytes = output_buffer.getvalue()
 
-    # 如果降低质量还不够，尝试缩小尺寸
+    # 2. 如果质量降到底(10)还是太大，开始缩小尺寸
     if len(output_bytes) > target_size:
         width, height = img.size
 
-        while len(output_bytes) > target_size and quality > 10:
-            # 缩小10%
+        # 修改点：这里去掉了 'and quality > 10'，改为防止图片缩得太小 (width > 100)
+        while len(output_bytes) > target_size and width > 100:
             width = int(width * 0.9)
             height = int(height * 0.9)
+
+            # 重新调整尺寸
             img_resized = img.resize((width, height), Image.Resampling.LANCZOS)
+
             output_buffer = io.BytesIO()
+            # 注意：这里继续使用当前的最低质量(10)进行保存，或者你可以适当回调一点质量
             img_resized.save(output_buffer, 'JPEG', quality=quality, optimize=True)
             output_bytes = output_buffer.getvalue()
 
-    final_size = len(output_bytes) / (1024 * 1024)
-    # print(f"压缩完成！")
-    # print(f"原始大小: {len(input_bytes) / (1024 * 1024):.2f}MB")
-    # print(f"压缩后大小: {final_size:.2f}MB")
-    # print(f"最终质量: {quality}")
-
     return output_bytes
-
 # todo: 大致盘一下各种判定的逻辑【以下的所有压缩比之间的差距均取“绝对值”】
 #  1. 如果requests、无头、有头获取到的压缩比之间从差距都在15%以内，则认定该页面是静态页面，此时优先使用requests请求
 #  2. 如果requests的status_code为特定的412，或者521，则判定是瑞数和jsl。[此时还有一个特点：requests的压缩比会与其他两种方式获取到的压缩比差距非常大(一两千的那种)]