XMWAI 0.4.12__tar.gz → 0.4.23__tar.gz

{xmwai-0.4.12/XMWAI.egg-info → xmwai-0.4.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: XMWAI
-Version: 0.4.12
+Version: 0.4.23
 Summary: Small code King AI related library
 Home-page: https://github.com/Tonykai88/XMWAI.git
 Author: pydevelopment

{xmwai-0.4.12 → xmwai-0.4.23}/XMWAI/__init__.py

@@ -2,10 +2,10 @@ from .core import story, photo, reply, poem, crack, show  # 从子模块导入
 from .magic_core import birthday  # 从子模块导入函数到顶层
 from .bomb_core import bomb  # 从子模块导入函数到顶层
 from .idiom_core import idiom, searchIdiom, get_json_path  # 从子模块导入函数到顶层
-from .trial_class import make, get_file_content_as_base64, save_pic, detect_windows_scale, get_file_content_as_base64_2, cartoon  # 从子模块导入函数到顶层
+from .trial_class import make, get_file_content_as_base64, save_pic, detect_scale, open_image, get_file_content_as_base64_2, cartoon  # 从子模块导入函数到顶层
 from .web_core import burger, cookbook  # 从子模块导入函数到顶层
 
 __all__ = ["story", "photo", "reply", "poem", 'birthday', 'bomb',
            "idiom", "searchIdiom", "get_json_path", "crack", "show",
-           "make", "get_file_content_as_base64", "save_pic", "detect_windows_scale",
+           "make", "get_file_content_as_base64", "save_pic", "detect_scale", "open_image",
            "get_file_content_as_base64_2", "cartoon", "burger", "cookbook"]  # 可选：明确导出的内容

{xmwai-0.4.12 → xmwai-0.4.23}/XMWAI/trial_class.py

@@ -13,6 +13,9 @@ import cv2
 import numpy as np
 
 '''-----------体验课1-----------'''
+import urllib.parse
+import platform
+from io import BytesIO
 
 
 def make(screen):
@@ -57,9 +60,8 @@ def make(screen):
     # 发送创建任务请求
     response = requests.post(create_url, headers=headers,
                              data=create_payload.encode("utf-8"))
-    response.raise_for_status()  # 检查请求是否成功
+    response.raise_for_status()
     task_id = response.json()["data"]["task_id"]
-    # print(f"任务已创建，ID: {task_id}")
 
     # 轮询检查任务状态
     query_payload = json.dumps({"task_id": task_id}, ensure_ascii=False)
@@ -71,16 +73,15 @@ def make(screen):
             query_url, headers=headers, data=query_payload.encode("utf-8"))
         response.raise_for_status()
         task_status = response.json()["data"]["task_status"]
-        # print(f"任务状态: {task_status}")
 
     # 处理任务结果
     if task_status == "SUCCESS":
         picture = requests.get(response.json()[
-                               "data"]["sub_task_result_list"][0]["final_image_list"][0]["img_url"])
+            "data"]["sub_task_result_list"][0]["final_image_list"][0]["img_url"])
         image_data = BytesIO(picture.content)
         image = Image.open(image_data)
         image.save('image.gif')
-        os.system("image.gif")
+        open_image("image.gif")
     else:
         print(f"任务失败，状态: {task_status}")
 
@@ -99,14 +100,31 @@ def get_file_content_as_base64(path, urlencoded=False):
     return content
 
 
+def detect_scale():
+    """
+    跨平台缩放比例检测
+    - Windows: 检测实际 DPI
+    - macOS/Linux: 默认返回 1.0
+    """
+    if platform.system() == "Windows":
+        try:
+            user32 = ctypes.windll.user32
+            user32.SetProcessDPIAware()
+            if hasattr(user32, 'GetDpiForSystem'):
+                dpi = user32.GetDpiForSystem()
+                return dpi / 96.0
+            screen_width = user32.GetSystemMetrics(0)
+            return screen_width / 1920.0
+        except Exception:
+            return 1.0
+    else:
+        return 1.0
+
+
 def save_pic(screen, output_file="pic.png"):
     """
     精准截取turtle绘图区域，不包含窗口边框和标题栏
-    专为Windows系统优化，支持高DPI缩放
-
-    参数:
-        screen: turtle的Screen对象
-        output_file: 输出文件名
+    跨平台支持 (Windows/macOS/Linux)
     """
     canvas = screen.getcanvas()
     screen.update()
@@ -118,62 +136,48 @@ def save_pic(screen, output_file="pic.png"):
         width = canvas.winfo_width()
         height = canvas.winfo_height()
 
-        # 检测Windows屏幕缩放比例
-        scale_factor = detect_windows_scale()
-        # print(f"检测到屏幕缩放比例: {scale_factor}x")
+        # 检测屏幕缩放比例
+        scale_factor = detect_scale()
 
-        # 调整截图区域，排除窗口边框
-        # 典型Windows窗口边框宽度约为8像素，标题栏约为30像素
-        border_width = int(8 * scale_factor)
-        title_height = int(30 * scale_factor)
+        # Windows 上要扣除边框和标题栏
+        border_width = int(
+            8 * scale_factor) if platform.system() == "Windows" else 0
+        title_height = int(
+            30 * scale_factor) if platform.system() == "Windows" else 0
 
         # 计算实际绘图区域
         img = ImageGrab.grab(
             bbox=(
-                x + border_width,  # 左边界，排除左侧边框
-                y + title_height,  # 上边界，排除标题栏和上边框
-                x + width - border_width,  # 右边界，排除右侧边框
-                y + height - border_width  # 下边界，排除底部边框
+                x + border_width,
+                y + title_height,
+                x + width - border_width,
+                y + height - border_width
             )
         )
 
-        # 保存为PNG
         img.save(output_file)
-        # print(f"已保存图形到 {output_file} (尺寸: {img.size})")
     except Exception as e:
         print(f"截图时出错: {e}")
-        print("提示: 尝试使用save_turtle_canvas_fallback函数或手动截图")
+        print("提示: 可以尝试手动截图或使用其他方法")
 
 
-def detect_windows_scale():
+def open_image(file_path):
     """
-    检测Windows系统的屏幕缩放比例
-    优先使用高精度方法，失败则降级使用兼容性方法
+    跨平台打开图片
+    - Windows: os.startfile
+    - macOS: open
+    - Linux: xdg-open
     """
+    system = platform.system()
     try:
-        # 高精度方法：获取系统DPI
-        user32 = ctypes.windll.user32
-        user32.SetProcessDPIAware()
-
-        # 尝试获取系统DPI (Windows 8.1及以上)
-        if hasattr(user32, 'GetDpiForSystem'):
-            dpi = user32.GetDpiForSystem()
-            return dpi / 96.0  # Windows标准DPI是96
-
-        # 尝试获取显示器DPI (Windows 10及以上)
-        if hasattr(user32, 'GetDpiForWindow'):
-            root = tk.Tk()
-            dpi = user32.GetDpiForWindow(root.winfo_id())
-            root.destroy()
-            return dpi / 96.0
-
-        # 兼容方法：获取屏幕尺寸并与标准尺寸比较
-        screen_width = user32.GetSystemMetrics(0)
-        return screen_width / 1920.0  # 假设标准分辨率为1920x1080
+        if system == "Windows":
+            os.startfile(file_path)
+        elif system == "Darwin":  # macOS
+            os.system(f"open {file_path}")
+        else:  # Linux / 其他
+            os.system(f"xdg-open {file_path}")
     except Exception as e:
-        print(f"检测缩放比例时出错: {e}")
-        print("使用默认缩放比例1.0")
-        return 1.0
+        print(f"打开图片失败: {e}")
 
 
 '''-----------体验课2-----------'''

{xmwai-0.4.12 → xmwai-0.4.23/XMWAI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: XMWAI
-Version: 0.4.12
+Version: 0.4.23
 Summary: Small code King AI related library
 Home-page: https://github.com/Tonykai88/XMWAI.git
 Author: pydevelopment

{xmwai-0.4.12 → xmwai-0.4.23}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="XMWAI",  # 包名（pip install XMWAI）
-    version="0.4.12",  # 每次上传记得升级版本号
+    version="0.4.23",  # 每次上传记得升级版本号
     author="pydevelopment",  # 作者
     author_email="hekai@xiaoma.cn",  # 邮箱
     description="Small code King AI related library",  # 简短描述