dsh-plugin-image-workbench 1.1.5 → 1.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (173) hide show
  1. package/LICENSE +21 -21
  2. package/README.en.md +5 -3
  3. package/README.md +7 -3
  4. package/client.js +241 -241
  5. package/cordis.patch.yml +14 -14
  6. package/host.js +51 -0
  7. package/install.mjs +333 -387
  8. package/package.json +3 -2
  9. package/scripts/fetch-style-images.mjs +104 -0
  10. package/scripts/vendor-snapshot.py +154 -154
  11. package/server/access.py +26 -26
  12. package/server/app.py +1371 -1329
  13. package/server/catalog.py +147 -147
  14. package/server/composer.py +391 -391
  15. package/server/drafts.py +158 -158
  16. package/server/history.py +575 -575
  17. package/server/imaging.py +172 -172
  18. package/server/pool.py +1335 -1335
  19. package/server/pool_admin.py +921 -921
  20. package/server/pool_service.py +1073 -1073
  21. package/server/requirements.txt +6 -6
  22. package/server/smoke_check.py +402 -402
  23. package/server/static/access.html +202 -202
  24. package/server/static/index.html +15 -0
  25. package/vendor/chatgpt2api/source/.env.example +82 -82
  26. package/vendor/chatgpt2api/source/.python-version +1 -1
  27. package/vendor/chatgpt2api/source/LICENSE +21 -21
  28. package/vendor/chatgpt2api/source/README.md +391 -391
  29. package/vendor/chatgpt2api/source/VERSION +1 -1
  30. package/vendor/chatgpt2api/source/api/__init__.py +2 -2
  31. package/vendor/chatgpt2api/source/api/accounts.py +537 -537
  32. package/vendor/chatgpt2api/source/api/ai.py +217 -217
  33. package/vendor/chatgpt2api/source/api/app.py +62 -62
  34. package/vendor/chatgpt2api/source/api/errors.py +46 -46
  35. package/vendor/chatgpt2api/source/api/image_inputs.py +309 -309
  36. package/vendor/chatgpt2api/source/api/image_tasks.py +120 -120
  37. package/vendor/chatgpt2api/source/api/support.py +134 -134
  38. package/vendor/chatgpt2api/source/api/system.py +365 -365
  39. package/vendor/chatgpt2api/source/assets/kunrouai.svg +50 -50
  40. package/vendor/chatgpt2api/source/config.default.json +108 -108
  41. package/vendor/chatgpt2api/source/main.py +9 -9
  42. package/vendor/chatgpt2api/source/pyproject.toml +27 -27
  43. package/vendor/chatgpt2api/source/scripts/init_proxy_config.py +186 -186
  44. package/vendor/chatgpt2api/source/scripts/migrate_storage.py +163 -163
  45. package/vendor/chatgpt2api/source/scripts/privoxy-warp.conf +13 -13
  46. package/vendor/chatgpt2api/source/scripts/test_outlook_token_mailbox.py +385 -385
  47. package/vendor/chatgpt2api/source/scripts/test_storage.py +129 -129
  48. package/vendor/chatgpt2api/source/scripts/verify_oauth_refresh.py +92 -92
  49. package/vendor/chatgpt2api/source/services/account_service.py +1757 -1757
  50. package/vendor/chatgpt2api/source/services/auth_service.py +253 -253
  51. package/vendor/chatgpt2api/source/services/backup_service.py +671 -671
  52. package/vendor/chatgpt2api/source/services/config.py +667 -667
  53. package/vendor/chatgpt2api/source/services/content_filter.py +242 -242
  54. package/vendor/chatgpt2api/source/services/cpa_service.py +315 -315
  55. package/vendor/chatgpt2api/source/services/editable_file_task_service.py +260 -260
  56. package/vendor/chatgpt2api/source/services/image_service.py +376 -376
  57. package/vendor/chatgpt2api/source/services/image_storage_service.py +405 -405
  58. package/vendor/chatgpt2api/source/services/image_tags_service.py +76 -76
  59. package/vendor/chatgpt2api/source/services/image_task_service.py +550 -550
  60. package/vendor/chatgpt2api/source/services/log_service.py +337 -337
  61. package/vendor/chatgpt2api/source/services/model_service.py +182 -182
  62. package/vendor/chatgpt2api/source/services/oauth_login_service.py +267 -267
  63. package/vendor/chatgpt2api/source/services/openai_backend_api.py +2763 -2763
  64. package/vendor/chatgpt2api/source/services/openai_oauth.py +32 -32
  65. package/vendor/chatgpt2api/source/services/protocol/__init__.py +2 -2
  66. package/vendor/chatgpt2api/source/services/protocol/anthropic_v1_messages.py +307 -307
  67. package/vendor/chatgpt2api/source/services/protocol/chat_completion_cache.py +238 -238
  68. package/vendor/chatgpt2api/source/services/protocol/conversation.py +1644 -1644
  69. package/vendor/chatgpt2api/source/services/protocol/error_response.py +124 -124
  70. package/vendor/chatgpt2api/source/services/protocol/openai_search.py +19 -19
  71. package/vendor/chatgpt2api/source/services/protocol/openai_v1_chat_complete.py +316 -316
  72. package/vendor/chatgpt2api/source/services/protocol/openai_v1_image_edit.py +86 -86
  73. package/vendor/chatgpt2api/source/services/protocol/openai_v1_image_generations.py +42 -42
  74. package/vendor/chatgpt2api/source/services/protocol/openai_v1_models.py +53 -53
  75. package/vendor/chatgpt2api/source/services/protocol/openai_v1_response.py +453 -453
  76. package/vendor/chatgpt2api/source/services/protocol/web_search_tool.py +160 -160
  77. package/vendor/chatgpt2api/source/services/proxy_service.py +648 -648
  78. package/vendor/chatgpt2api/source/services/storage/__init__.py +5 -5
  79. package/vendor/chatgpt2api/source/services/storage/base.py +38 -38
  80. package/vendor/chatgpt2api/source/services/storage/database_storage.py +194 -194
  81. package/vendor/chatgpt2api/source/services/storage/factory.py +104 -104
  82. package/vendor/chatgpt2api/source/services/storage/git_storage.py +183 -183
  83. package/vendor/chatgpt2api/source/services/storage/json_storage.py +95 -95
  84. package/vendor/chatgpt2api/source/services/sub2api_service.py +531 -531
  85. package/vendor/chatgpt2api/source/utils/helper.py +469 -469
  86. package/vendor/chatgpt2api/source/utils/image_tokens.py +346 -346
  87. package/vendor/chatgpt2api/source/utils/log.py +110 -110
  88. package/vendor/chatgpt2api/source/utils/pkce.py +19 -19
  89. package/vendor/chatgpt2api/source/utils/pow.py +207 -207
  90. package/vendor/chatgpt2api/source/utils/sentinel.py +159 -159
  91. package/vendor/chatgpt2api/source/utils/turnstile.py +184 -184
  92. package/vendor/chatgpt2api/source/uv.lock +904 -904
  93. package/vendor/chatgpt2api/source/web/bun.lock +1501 -1501
  94. package/vendor/chatgpt2api/source/web/components.json +24 -24
  95. package/vendor/chatgpt2api/source/web/eslint.config.mjs +17 -17
  96. package/vendor/chatgpt2api/source/web/next.config.ts +40 -40
  97. package/vendor/chatgpt2api/source/web/package.json +58 -58
  98. package/vendor/chatgpt2api/source/web/postcss.config.mjs +5 -5
  99. package/vendor/chatgpt2api/source/web/src/app/accounts/components/account-import-dialog.tsx +925 -925
  100. package/vendor/chatgpt2api/source/web/src/app/accounts/page.tsx +1307 -1307
  101. package/vendor/chatgpt2api/source/web/src/app/debug/components/chat-panel.tsx +224 -224
  102. package/vendor/chatgpt2api/source/web/src/app/debug/components/editable-file-panel.tsx +444 -444
  103. package/vendor/chatgpt2api/source/web/src/app/debug/components/ppt-panel.tsx +9 -9
  104. package/vendor/chatgpt2api/source/web/src/app/debug/components/psd-panel.tsx +9 -9
  105. package/vendor/chatgpt2api/source/web/src/app/debug/components/search-panel.tsx +172 -172
  106. package/vendor/chatgpt2api/source/web/src/app/debug/components/skill-panel.tsx +169 -169
  107. package/vendor/chatgpt2api/source/web/src/app/debug/components/types.ts +39 -39
  108. package/vendor/chatgpt2api/source/web/src/app/debug/page.tsx +59 -59
  109. package/vendor/chatgpt2api/source/web/src/app/globals.css +230 -230
  110. package/vendor/chatgpt2api/source/web/src/app/image/components/image-composer.tsx +542 -542
  111. package/vendor/chatgpt2api/source/web/src/app/image/components/image-results.tsx +554 -554
  112. package/vendor/chatgpt2api/source/web/src/app/image/components/image-sidebar.tsx +176 -176
  113. package/vendor/chatgpt2api/source/web/src/app/image/page.tsx +1799 -1799
  114. package/vendor/chatgpt2api/source/web/src/app/image-manager/page.tsx +732 -732
  115. package/vendor/chatgpt2api/source/web/src/app/layout.tsx +50 -50
  116. package/vendor/chatgpt2api/source/web/src/app/login/page.tsx +101 -101
  117. package/vendor/chatgpt2api/source/web/src/app/logs/page.tsx +356 -356
  118. package/vendor/chatgpt2api/source/web/src/app/page.tsx +30 -30
  119. package/vendor/chatgpt2api/source/web/src/app/settings/components/api-docs-card.tsx +341 -341
  120. package/vendor/chatgpt2api/source/web/src/app/settings/components/backup-settings-card.tsx +447 -447
  121. package/vendor/chatgpt2api/source/web/src/app/settings/components/base-url-card.tsx +71 -71
  122. package/vendor/chatgpt2api/source/web/src/app/settings/components/config-card.tsx +491 -491
  123. package/vendor/chatgpt2api/source/web/src/app/settings/components/cpa-pool-dialog.tsx +108 -108
  124. package/vendor/chatgpt2api/source/web/src/app/settings/components/cpa-pools-card.tsx +169 -169
  125. package/vendor/chatgpt2api/source/web/src/app/settings/components/import-browser-dialog.tsx +185 -185
  126. package/vendor/chatgpt2api/source/web/src/app/settings/components/proxy-runtime-card.tsx +379 -379
  127. package/vendor/chatgpt2api/source/web/src/app/settings/components/proxy-settings-card.tsx +127 -127
  128. package/vendor/chatgpt2api/source/web/src/app/settings/components/proxy-settings.tsx +200 -200
  129. package/vendor/chatgpt2api/source/web/src/app/settings/components/settings-header.tsx +12 -12
  130. package/vendor/chatgpt2api/source/web/src/app/settings/components/sub2api-connections.tsx +886 -886
  131. package/vendor/chatgpt2api/source/web/src/app/settings/components/third-party-apps-card.tsx +81 -81
  132. package/vendor/chatgpt2api/source/web/src/app/settings/components/user-keys-card.tsx +422 -422
  133. package/vendor/chatgpt2api/source/web/src/app/settings/page.tsx +135 -135
  134. package/vendor/chatgpt2api/source/web/src/app/settings/store.ts +1069 -1069
  135. package/vendor/chatgpt2api/source/web/src/components/date-range-filter.tsx +49 -49
  136. package/vendor/chatgpt2api/source/web/src/components/header-actions.tsx +24 -24
  137. package/vendor/chatgpt2api/source/web/src/components/image-lightbox.tsx +434 -434
  138. package/vendor/chatgpt2api/source/web/src/components/image-thumbnail.tsx +46 -46
  139. package/vendor/chatgpt2api/source/web/src/components/theme-script.tsx +18 -18
  140. package/vendor/chatgpt2api/source/web/src/components/theme-toggle.tsx +14 -14
  141. package/vendor/chatgpt2api/source/web/src/components/top-nav.tsx +263 -263
  142. package/vendor/chatgpt2api/source/web/src/components/ui/animated-theme-toggler.tsx +256 -256
  143. package/vendor/chatgpt2api/source/web/src/components/ui/badge.tsx +41 -41
  144. package/vendor/chatgpt2api/source/web/src/components/ui/button.tsx +59 -59
  145. package/vendor/chatgpt2api/source/web/src/components/ui/calendar.tsx +46 -46
  146. package/vendor/chatgpt2api/source/web/src/components/ui/card.tsx +61 -61
  147. package/vendor/chatgpt2api/source/web/src/components/ui/checkbox.tsx +27 -27
  148. package/vendor/chatgpt2api/source/web/src/components/ui/dia-text-reveal.tsx +267 -267
  149. package/vendor/chatgpt2api/source/web/src/components/ui/dialog.tsx +132 -132
  150. package/vendor/chatgpt2api/source/web/src/components/ui/field.tsx +13 -13
  151. package/vendor/chatgpt2api/source/web/src/components/ui/input.tsx +19 -19
  152. package/vendor/chatgpt2api/source/web/src/components/ui/label.tsx +24 -24
  153. package/vendor/chatgpt2api/source/web/src/components/ui/morphing-text.tsx +149 -149
  154. package/vendor/chatgpt2api/source/web/src/components/ui/popover.tsx +38 -38
  155. package/vendor/chatgpt2api/source/web/src/components/ui/select.tsx +175 -175
  156. package/vendor/chatgpt2api/source/web/src/components/ui/sheet.tsx +143 -143
  157. package/vendor/chatgpt2api/source/web/src/components/ui/table.tsx +29 -29
  158. package/vendor/chatgpt2api/source/web/src/components/ui/tabs.tsx +91 -91
  159. package/vendor/chatgpt2api/source/web/src/components/ui/text-3d-flip.tsx +269 -269
  160. package/vendor/chatgpt2api/source/web/src/components/ui/textarea.tsx +18 -18
  161. package/vendor/chatgpt2api/source/web/src/components/version-release-dialog.tsx +127 -127
  162. package/vendor/chatgpt2api/source/web/src/constants/common-env.ts +6 -6
  163. package/vendor/chatgpt2api/source/web/src/hooks/use-version-check.ts +85 -85
  164. package/vendor/chatgpt2api/source/web/src/lib/api.ts +926 -926
  165. package/vendor/chatgpt2api/source/web/src/lib/auth-session.ts +26 -26
  166. package/vendor/chatgpt2api/source/web/src/lib/release.ts +25 -25
  167. package/vendor/chatgpt2api/source/web/src/lib/request.ts +93 -93
  168. package/vendor/chatgpt2api/source/web/src/lib/use-auth-guard.ts +89 -89
  169. package/vendor/chatgpt2api/source/web/src/lib/utils.ts +6 -6
  170. package/vendor/chatgpt2api/source/web/src/store/auth.ts +112 -112
  171. package/vendor/chatgpt2api/source/web/src/store/editable-file-history.ts +33 -33
  172. package/vendor/chatgpt2api/source/web/src/store/image-conversations.ts +318 -318
  173. package/vendor/chatgpt2api/source/web/tsconfig.json +42 -42
@@ -1,376 +1,376 @@
1
- from __future__ import annotations
2
-
3
- import io
4
- import shutil
5
- import threading
6
- import time
7
- import zipfile
8
- from pathlib import Path
9
-
10
- from fastapi import HTTPException
11
- from fastapi.responses import FileResponse, Response
12
- from PIL import Image, ImageOps
13
-
14
- from services.config import config
15
- from services.image_storage_service import image_storage_service
16
- from services.image_tags_service import load_tags, remove_tags
17
- from utils.log import logger
18
-
19
- THUMBNAIL_SIZE = (320, 320)
20
-
21
-
22
- def _cleanup_empty_dirs(root: Path) -> None:
23
- for path in sorted((p for p in root.rglob("*") if p.is_dir()), key=lambda p: len(p.parts), reverse=True):
24
- try:
25
- path.rmdir()
26
- except OSError:
27
- pass
28
-
29
-
30
- def _safe_relative_path(path: str) -> str:
31
- value = str(path or "").strip().replace("\\", "/").lstrip("/")
32
- if not value:
33
- raise HTTPException(status_code=404, detail="image not found")
34
- parts = Path(value).parts
35
- if any(part in {"", ".", ".."} for part in parts):
36
- raise HTTPException(status_code=404, detail="image not found")
37
- return Path(*parts).as_posix()
38
-
39
-
40
- def _safe_image_path(relative_path: str) -> Path:
41
- rel = _safe_relative_path(relative_path)
42
- root = config.images_dir.resolve()
43
- path = (root / rel).resolve()
44
- try:
45
- path.relative_to(root)
46
- except ValueError as exc:
47
- raise HTTPException(status_code=404, detail="image not found") from exc
48
- if not path.is_file():
49
- raise HTTPException(status_code=404, detail="image not found")
50
- return path
51
-
52
-
53
- def get_image_response(relative_path: str) -> FileResponse | Response:
54
- headers = {
55
- "Access-Control-Allow-Origin": "*",
56
- "Access-Control-Allow-Methods": "GET, OPTIONS",
57
- "Access-Control-Allow-Headers": "*",
58
- }
59
- if image_storage_service.has_local(relative_path):
60
- return FileResponse(_safe_image_path(relative_path), headers=headers)
61
- return Response(content=image_storage_service.get_bytes(relative_path), media_type="image/png", headers=headers)
62
-
63
-
64
- def _thumbnail_path(relative_path: str) -> Path:
65
- rel = _safe_relative_path(relative_path)
66
- return config.image_thumbnails_dir / f"{rel}.png"
67
-
68
-
69
- def thumbnail_url(base_url: str, relative_path: str) -> str:
70
- return f"{base_url.rstrip('/')}/image-thumbnails/{_safe_relative_path(relative_path)}"
71
-
72
-
73
- def _image_dimensions(path: Path) -> tuple[int, int] | None:
74
- try:
75
- with Image.open(path) as image:
76
- return image.size
77
- except Exception:
78
- return None
79
-
80
-
81
- def ensure_thumbnail(relative_path: str) -> Path:
82
- target = _thumbnail_path(relative_path)
83
- source_mtime = 0.0
84
- source: Path | None = None
85
- if image_storage_service.has_local(relative_path):
86
- source = _safe_image_path(relative_path)
87
- source_mtime = source.stat().st_mtime
88
- if target.exists() and (not source_mtime or target.stat().st_mtime >= source_mtime):
89
- return target
90
-
91
- target.parent.mkdir(parents=True, exist_ok=True)
92
- try:
93
- image_source = source if source is not None else io.BytesIO(image_storage_service.get_bytes(relative_path))
94
- with Image.open(image_source) as image:
95
- image = ImageOps.exif_transpose(image)
96
- if image.mode not in {"RGB", "RGBA"}:
97
- image = image.convert("RGBA" if "A" in image.getbands() else "RGB")
98
- image.thumbnail(THUMBNAIL_SIZE, Image.Resampling.LANCZOS)
99
- image.save(target, format="PNG", optimize=True)
100
- except HTTPException:
101
- raise
102
- except Exception as exc:
103
- raise HTTPException(status_code=422, detail="failed to create thumbnail") from exc
104
- return target
105
-
106
-
107
- def get_thumbnail_response(relative_path: str) -> FileResponse:
108
- headers = {
109
- "Access-Control-Allow-Origin": "*",
110
- "Access-Control-Allow-Methods": "GET, OPTIONS",
111
- "Access-Control-Allow-Headers": "*",
112
- }
113
- return FileResponse(ensure_thumbnail(relative_path), headers=headers)
114
-
115
-
116
- def get_image_download_response(relative_path: str) -> FileResponse:
117
- cors_headers = {
118
- "Access-Control-Allow-Origin": "*",
119
- "Access-Control-Allow-Methods": "GET, OPTIONS",
120
- "Access-Control-Allow-Headers": "*",
121
- }
122
- if image_storage_service.has_local(relative_path):
123
- path = _safe_image_path(relative_path)
124
- headers = {**cors_headers, "Content-Disposition": f'attachment; filename="{path.name}"'}
125
- return FileResponse(path, filename=path.name, headers=headers)
126
- rel = _safe_relative_path(relative_path)
127
- headers = {
128
- **cors_headers,
129
- "Content-Disposition": f'attachment; filename="{Path(rel).name}"',
130
- }
131
- return Response(
132
- content=image_storage_service.get_bytes(rel),
133
- media_type="image/png",
134
- headers=headers,
135
- )
136
-
137
-
138
- def cleanup_image_thumbnails() -> int:
139
- thumbnails_root = config.image_thumbnails_dir
140
- removed = 0
141
- for path in thumbnails_root.rglob("*"):
142
- if not path.is_file():
143
- continue
144
- rel = path.relative_to(thumbnails_root).as_posix()
145
- if not rel.endswith(".png") or not image_storage_service.exists(rel[:-4]):
146
- path.unlink()
147
- removed += 1
148
- _cleanup_empty_dirs(thumbnails_root)
149
- return removed
150
-
151
- def list_images(base_url: str, start_date: str = "", end_date: str = "") -> dict[str, object]:
152
- config.cleanup_old_images()
153
- cleanup_image_thumbnails()
154
- all_tags = load_tags()
155
- items = [
156
- {
157
- **item,
158
- "url": str(item.get("url") or f"{base_url.rstrip('/')}/images/{item['path']}"),
159
- "thumbnail_url": thumbnail_url(base_url, str(item["path"])),
160
- "tags": all_tags.get(str(item["path"]), []),
161
- }
162
- for item in image_storage_service.list_items(base_url, start_date, end_date)
163
- ]
164
- groups: dict[str, list[dict[str, object]]] = {}
165
- for item in items:
166
- groups.setdefault(str(item["date"]), []).append(item)
167
- return {"items": items, "groups": [{"date": key, "items": value} for key, value in groups.items()]}
168
-
169
-
170
- def delete_images(paths: list[str] | None = None, start_date: str = "", end_date: str = "", all_matching: bool = False) -> dict[str, int]:
171
- root = config.images_dir.resolve()
172
- targets = [
173
- str(item["path"])
174
- for item in image_storage_service.list_items("", start_date=start_date, end_date=end_date)
175
- ] if all_matching else (paths or [])
176
- removed = 0
177
- for item in targets:
178
- path = (root / item).resolve()
179
- try:
180
- path.relative_to(root)
181
- except ValueError:
182
- continue
183
- if image_storage_service.delete(item):
184
- removed += 1
185
- for thumbnail in (_thumbnail_path(item), config.image_thumbnails_dir / _safe_relative_path(item)):
186
- if thumbnail.is_file():
187
- thumbnail.unlink()
188
- remove_tags(item)
189
- _cleanup_empty_dirs(root)
190
- _cleanup_empty_dirs(config.image_thumbnails_dir)
191
- return {"removed": removed}
192
-
193
-
194
- def download_images_zip(paths: list[str]) -> io.BytesIO:
195
- root = config.images_dir.resolve()
196
- buf = io.BytesIO()
197
- added = 0
198
- used_names: set[str] = set()
199
- with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as zf:
200
- for item in paths:
201
- rel = _safe_relative_path(item)
202
- path = (root / rel).resolve()
203
- payload: bytes | None = None
204
- try:
205
- path.relative_to(root)
206
- except ValueError:
207
- continue
208
- if path.is_file():
209
- payload = path.read_bytes()
210
- else:
211
- try:
212
- payload = image_storage_service.get_bytes(rel)
213
- except Exception:
214
- continue
215
- name = path.name
216
- if name in used_names:
217
- stem = path.stem
218
- suffix = path.suffix
219
- counter = 2
220
- while f"{stem}_{counter}{suffix}" in used_names:
221
- counter += 1
222
- name = f"{stem}_{counter}{suffix}"
223
- used_names.add(name)
224
- zf.writestr(name, payload)
225
- added += 1
226
- if added == 0:
227
- raise HTTPException(status_code=404, detail="no images found")
228
- buf.seek(0)
229
- return buf
230
- def storage_stats() -> dict:
231
- import shutil
232
- usage = shutil.disk_usage(config.images_dir)
233
- total_mb = usage.total // (1024 * 1024)
234
- used_mb = usage.used // (1024 * 1024)
235
- free_mb = usage.free // (1024 * 1024)
236
-
237
- image_count = 0
238
- image_size = 0
239
- for p in config.images_dir.rglob("*"):
240
- if p.is_file():
241
- image_count += 1
242
- image_size += p.stat().st_size
243
-
244
- return {
245
- "disk_total_mb": total_mb,
246
- "disk_used_mb": used_mb,
247
- "disk_free_mb": free_mb,
248
- "image_count": image_count,
249
- "image_size_mb": image_size // (1024 * 1024),
250
- "image_size_bytes": image_size,
251
- }
252
-
253
-
254
- def compress_images(quality: int = 60) -> dict:
255
- """重新压缩所有图片,返回节省的空间"""
256
- saved = 0
257
- count = 0
258
- for p in sorted(config.images_dir.rglob("*.png")):
259
- if not p.is_file():
260
- continue
261
- try:
262
- orig = p.stat().st_size
263
- with Image.open(p) as img:
264
- img = ImageOps.exif_transpose(img)
265
- img.save(str(p) + ".tmp", format="PNG", optimize=True)
266
- new_size = Path(str(p) + ".tmp").stat().st_size
267
- if new_size < orig:
268
- Path(str(p) + ".tmp").replace(p)
269
- saved += orig - new_size
270
- count += 1
271
- else:
272
- Path(str(p) + ".tmp").unlink()
273
- except Exception:
274
- pass
275
- return {"compressed": count, "saved_bytes": saved, "saved_mb": saved // (1024 * 1024)}
276
-
277
-
278
- def delete_to_target(target_free_mb: int, dry_run: bool = False) -> dict:
279
- """删除最旧的图片直到剩余空间达到 target_free_mb"""
280
- import shutil
281
- usage = shutil.disk_usage(config.images_dir)
282
- current_free = usage.free // (1024 * 1024)
283
- if current_free >= target_free_mb and not dry_run:
284
- return {"removed": 0, "current_free_mb": current_free, "target_free_mb": target_free_mb, "done": True}
285
-
286
- files = sorted(
287
- (p for p in config.images_dir.rglob("*.png") if p.is_file()),
288
- key=lambda p: p.stat().st_mtime,
289
- )
290
- removed = 0
291
- freed = 0
292
- for p in files:
293
- if current_free + freed // (1024 * 1024) >= target_free_mb:
294
- break
295
- size = p.stat().st_size
296
- if not dry_run:
297
- rel = p.relative_to(config.images_dir).as_posix()
298
- for tp in (_thumbnail_path(rel), config.image_thumbnails_dir / _safe_relative_path(rel)):
299
- if tp.is_file():
300
- tp.unlink()
301
- remove_tags(rel)
302
- p.unlink()
303
- freed += size
304
- removed += 1
305
-
306
- if not dry_run:
307
- _cleanup_empty_dirs(config.images_dir)
308
- _cleanup_empty_dirs(config.image_thumbnails_dir)
309
-
310
- return {
311
- "removed": removed,
312
- "freed_mb": freed // (1024 * 1024),
313
- "target_free_mb": target_free_mb,
314
- "current_free_mb": current_free + (freed // (1024 * 1024)),
315
- "done": (current_free + freed // (1024 * 1024)) >= target_free_mb,
316
- "dry_run": dry_run,
317
- }
318
-
319
-
320
- def download_images_zip(paths: list[str]) -> io.BytesIO:
321
- root = config.images_dir.resolve()
322
- buf = io.BytesIO()
323
- added = 0
324
- used_names: set[str] = set()
325
- with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as zf:
326
- for item in paths:
327
- rel = _safe_relative_path(item)
328
- path = (root / rel).resolve()
329
- try:
330
- path.relative_to(root)
331
- except ValueError:
332
- continue
333
- if not path.is_file():
334
- continue
335
- name = path.name
336
- if name in used_names:
337
- stem = path.stem
338
- suffix = path.suffix
339
- counter = 2
340
- while f"{stem}_{counter}{suffix}" in used_names:
341
- counter += 1
342
- name = f"{stem}_{counter}{suffix}"
343
- used_names.add(name)
344
- zf.write(path, name)
345
- added += 1
346
- if added == 0:
347
- raise HTTPException(status_code=404, detail="no images found")
348
- buf.seek(0)
349
- return buf
350
-
351
-
352
- def _auto_cleanup_worker(stop_event: threading.Event) -> None:
353
- """后台线程:每30分钟检查存储,空间低于阈值自动清理最旧图片"""
354
- import shutil
355
- min_free_mb = getattr(config, "image_min_free_mb", None)
356
- if min_free_mb is None:
357
- min_free_mb = 500
358
-
359
- while not stop_event.wait(1800): # 每30分钟
360
- try:
361
- config.cleanup_old_images()
362
- cleanup_image_thumbnails()
363
- usage = shutil.disk_usage(config.images_dir)
364
- free_mb = usage.free // (1024 * 1024)
365
- if free_mb < min_free_mb:
366
- logger.info({"event": "image_auto_cleanup", "free_mb": free_mb, "min_free_mb": min_free_mb})
367
- result = delete_to_target(min_free_mb)
368
- logger.info({"event": "image_auto_cleanup_done", **result})
369
- except Exception:
370
- pass
371
-
372
-
373
- def start_image_cleanup_scheduler(stop_event: threading.Event) -> threading.Thread:
374
- t = threading.Thread(target=_auto_cleanup_worker, args=(stop_event,), daemon=True, name="image-cleanup")
375
- t.start()
376
- return t
1
+ from __future__ import annotations
2
+
3
+ import io
4
+ import shutil
5
+ import threading
6
+ import time
7
+ import zipfile
8
+ from pathlib import Path
9
+
10
+ from fastapi import HTTPException
11
+ from fastapi.responses import FileResponse, Response
12
+ from PIL import Image, ImageOps
13
+
14
+ from services.config import config
15
+ from services.image_storage_service import image_storage_service
16
+ from services.image_tags_service import load_tags, remove_tags
17
+ from utils.log import logger
18
+
19
+ THUMBNAIL_SIZE = (320, 320)
20
+
21
+
22
+ def _cleanup_empty_dirs(root: Path) -> None:
23
+ for path in sorted((p for p in root.rglob("*") if p.is_dir()), key=lambda p: len(p.parts), reverse=True):
24
+ try:
25
+ path.rmdir()
26
+ except OSError:
27
+ pass
28
+
29
+
30
+ def _safe_relative_path(path: str) -> str:
31
+ value = str(path or "").strip().replace("\\", "/").lstrip("/")
32
+ if not value:
33
+ raise HTTPException(status_code=404, detail="image not found")
34
+ parts = Path(value).parts
35
+ if any(part in {"", ".", ".."} for part in parts):
36
+ raise HTTPException(status_code=404, detail="image not found")
37
+ return Path(*parts).as_posix()
38
+
39
+
40
+ def _safe_image_path(relative_path: str) -> Path:
41
+ rel = _safe_relative_path(relative_path)
42
+ root = config.images_dir.resolve()
43
+ path = (root / rel).resolve()
44
+ try:
45
+ path.relative_to(root)
46
+ except ValueError as exc:
47
+ raise HTTPException(status_code=404, detail="image not found") from exc
48
+ if not path.is_file():
49
+ raise HTTPException(status_code=404, detail="image not found")
50
+ return path
51
+
52
+
53
+ def get_image_response(relative_path: str) -> FileResponse | Response:
54
+ headers = {
55
+ "Access-Control-Allow-Origin": "*",
56
+ "Access-Control-Allow-Methods": "GET, OPTIONS",
57
+ "Access-Control-Allow-Headers": "*",
58
+ }
59
+ if image_storage_service.has_local(relative_path):
60
+ return FileResponse(_safe_image_path(relative_path), headers=headers)
61
+ return Response(content=image_storage_service.get_bytes(relative_path), media_type="image/png", headers=headers)
62
+
63
+
64
+ def _thumbnail_path(relative_path: str) -> Path:
65
+ rel = _safe_relative_path(relative_path)
66
+ return config.image_thumbnails_dir / f"{rel}.png"
67
+
68
+
69
+ def thumbnail_url(base_url: str, relative_path: str) -> str:
70
+ return f"{base_url.rstrip('/')}/image-thumbnails/{_safe_relative_path(relative_path)}"
71
+
72
+
73
+ def _image_dimensions(path: Path) -> tuple[int, int] | None:
74
+ try:
75
+ with Image.open(path) as image:
76
+ return image.size
77
+ except Exception:
78
+ return None
79
+
80
+
81
+ def ensure_thumbnail(relative_path: str) -> Path:
82
+ target = _thumbnail_path(relative_path)
83
+ source_mtime = 0.0
84
+ source: Path | None = None
85
+ if image_storage_service.has_local(relative_path):
86
+ source = _safe_image_path(relative_path)
87
+ source_mtime = source.stat().st_mtime
88
+ if target.exists() and (not source_mtime or target.stat().st_mtime >= source_mtime):
89
+ return target
90
+
91
+ target.parent.mkdir(parents=True, exist_ok=True)
92
+ try:
93
+ image_source = source if source is not None else io.BytesIO(image_storage_service.get_bytes(relative_path))
94
+ with Image.open(image_source) as image:
95
+ image = ImageOps.exif_transpose(image)
96
+ if image.mode not in {"RGB", "RGBA"}:
97
+ image = image.convert("RGBA" if "A" in image.getbands() else "RGB")
98
+ image.thumbnail(THUMBNAIL_SIZE, Image.Resampling.LANCZOS)
99
+ image.save(target, format="PNG", optimize=True)
100
+ except HTTPException:
101
+ raise
102
+ except Exception as exc:
103
+ raise HTTPException(status_code=422, detail="failed to create thumbnail") from exc
104
+ return target
105
+
106
+
107
+ def get_thumbnail_response(relative_path: str) -> FileResponse:
108
+ headers = {
109
+ "Access-Control-Allow-Origin": "*",
110
+ "Access-Control-Allow-Methods": "GET, OPTIONS",
111
+ "Access-Control-Allow-Headers": "*",
112
+ }
113
+ return FileResponse(ensure_thumbnail(relative_path), headers=headers)
114
+
115
+
116
+ def get_image_download_response(relative_path: str) -> FileResponse:
117
+ cors_headers = {
118
+ "Access-Control-Allow-Origin": "*",
119
+ "Access-Control-Allow-Methods": "GET, OPTIONS",
120
+ "Access-Control-Allow-Headers": "*",
121
+ }
122
+ if image_storage_service.has_local(relative_path):
123
+ path = _safe_image_path(relative_path)
124
+ headers = {**cors_headers, "Content-Disposition": f'attachment; filename="{path.name}"'}
125
+ return FileResponse(path, filename=path.name, headers=headers)
126
+ rel = _safe_relative_path(relative_path)
127
+ headers = {
128
+ **cors_headers,
129
+ "Content-Disposition": f'attachment; filename="{Path(rel).name}"',
130
+ }
131
+ return Response(
132
+ content=image_storage_service.get_bytes(rel),
133
+ media_type="image/png",
134
+ headers=headers,
135
+ )
136
+
137
+
138
+ def cleanup_image_thumbnails() -> int:
139
+ thumbnails_root = config.image_thumbnails_dir
140
+ removed = 0
141
+ for path in thumbnails_root.rglob("*"):
142
+ if not path.is_file():
143
+ continue
144
+ rel = path.relative_to(thumbnails_root).as_posix()
145
+ if not rel.endswith(".png") or not image_storage_service.exists(rel[:-4]):
146
+ path.unlink()
147
+ removed += 1
148
+ _cleanup_empty_dirs(thumbnails_root)
149
+ return removed
150
+
151
+ def list_images(base_url: str, start_date: str = "", end_date: str = "") -> dict[str, object]:
152
+ config.cleanup_old_images()
153
+ cleanup_image_thumbnails()
154
+ all_tags = load_tags()
155
+ items = [
156
+ {
157
+ **item,
158
+ "url": str(item.get("url") or f"{base_url.rstrip('/')}/images/{item['path']}"),
159
+ "thumbnail_url": thumbnail_url(base_url, str(item["path"])),
160
+ "tags": all_tags.get(str(item["path"]), []),
161
+ }
162
+ for item in image_storage_service.list_items(base_url, start_date, end_date)
163
+ ]
164
+ groups: dict[str, list[dict[str, object]]] = {}
165
+ for item in items:
166
+ groups.setdefault(str(item["date"]), []).append(item)
167
+ return {"items": items, "groups": [{"date": key, "items": value} for key, value in groups.items()]}
168
+
169
+
170
+ def delete_images(paths: list[str] | None = None, start_date: str = "", end_date: str = "", all_matching: bool = False) -> dict[str, int]:
171
+ root = config.images_dir.resolve()
172
+ targets = [
173
+ str(item["path"])
174
+ for item in image_storage_service.list_items("", start_date=start_date, end_date=end_date)
175
+ ] if all_matching else (paths or [])
176
+ removed = 0
177
+ for item in targets:
178
+ path = (root / item).resolve()
179
+ try:
180
+ path.relative_to(root)
181
+ except ValueError:
182
+ continue
183
+ if image_storage_service.delete(item):
184
+ removed += 1
185
+ for thumbnail in (_thumbnail_path(item), config.image_thumbnails_dir / _safe_relative_path(item)):
186
+ if thumbnail.is_file():
187
+ thumbnail.unlink()
188
+ remove_tags(item)
189
+ _cleanup_empty_dirs(root)
190
+ _cleanup_empty_dirs(config.image_thumbnails_dir)
191
+ return {"removed": removed}
192
+
193
+
194
+ def download_images_zip(paths: list[str]) -> io.BytesIO:
195
+ root = config.images_dir.resolve()
196
+ buf = io.BytesIO()
197
+ added = 0
198
+ used_names: set[str] = set()
199
+ with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as zf:
200
+ for item in paths:
201
+ rel = _safe_relative_path(item)
202
+ path = (root / rel).resolve()
203
+ payload: bytes | None = None
204
+ try:
205
+ path.relative_to(root)
206
+ except ValueError:
207
+ continue
208
+ if path.is_file():
209
+ payload = path.read_bytes()
210
+ else:
211
+ try:
212
+ payload = image_storage_service.get_bytes(rel)
213
+ except Exception:
214
+ continue
215
+ name = path.name
216
+ if name in used_names:
217
+ stem = path.stem
218
+ suffix = path.suffix
219
+ counter = 2
220
+ while f"{stem}_{counter}{suffix}" in used_names:
221
+ counter += 1
222
+ name = f"{stem}_{counter}{suffix}"
223
+ used_names.add(name)
224
+ zf.writestr(name, payload)
225
+ added += 1
226
+ if added == 0:
227
+ raise HTTPException(status_code=404, detail="no images found")
228
+ buf.seek(0)
229
+ return buf
230
+ def storage_stats() -> dict:
231
+ import shutil
232
+ usage = shutil.disk_usage(config.images_dir)
233
+ total_mb = usage.total // (1024 * 1024)
234
+ used_mb = usage.used // (1024 * 1024)
235
+ free_mb = usage.free // (1024 * 1024)
236
+
237
+ image_count = 0
238
+ image_size = 0
239
+ for p in config.images_dir.rglob("*"):
240
+ if p.is_file():
241
+ image_count += 1
242
+ image_size += p.stat().st_size
243
+
244
+ return {
245
+ "disk_total_mb": total_mb,
246
+ "disk_used_mb": used_mb,
247
+ "disk_free_mb": free_mb,
248
+ "image_count": image_count,
249
+ "image_size_mb": image_size // (1024 * 1024),
250
+ "image_size_bytes": image_size,
251
+ }
252
+
253
+
254
+ def compress_images(quality: int = 60) -> dict:
255
+ """重新压缩所有图片,返回节省的空间"""
256
+ saved = 0
257
+ count = 0
258
+ for p in sorted(config.images_dir.rglob("*.png")):
259
+ if not p.is_file():
260
+ continue
261
+ try:
262
+ orig = p.stat().st_size
263
+ with Image.open(p) as img:
264
+ img = ImageOps.exif_transpose(img)
265
+ img.save(str(p) + ".tmp", format="PNG", optimize=True)
266
+ new_size = Path(str(p) + ".tmp").stat().st_size
267
+ if new_size < orig:
268
+ Path(str(p) + ".tmp").replace(p)
269
+ saved += orig - new_size
270
+ count += 1
271
+ else:
272
+ Path(str(p) + ".tmp").unlink()
273
+ except Exception:
274
+ pass
275
+ return {"compressed": count, "saved_bytes": saved, "saved_mb": saved // (1024 * 1024)}
276
+
277
+
278
+ def delete_to_target(target_free_mb: int, dry_run: bool = False) -> dict:
279
+ """删除最旧的图片直到剩余空间达到 target_free_mb"""
280
+ import shutil
281
+ usage = shutil.disk_usage(config.images_dir)
282
+ current_free = usage.free // (1024 * 1024)
283
+ if current_free >= target_free_mb and not dry_run:
284
+ return {"removed": 0, "current_free_mb": current_free, "target_free_mb": target_free_mb, "done": True}
285
+
286
+ files = sorted(
287
+ (p for p in config.images_dir.rglob("*.png") if p.is_file()),
288
+ key=lambda p: p.stat().st_mtime,
289
+ )
290
+ removed = 0
291
+ freed = 0
292
+ for p in files:
293
+ if current_free + freed // (1024 * 1024) >= target_free_mb:
294
+ break
295
+ size = p.stat().st_size
296
+ if not dry_run:
297
+ rel = p.relative_to(config.images_dir).as_posix()
298
+ for tp in (_thumbnail_path(rel), config.image_thumbnails_dir / _safe_relative_path(rel)):
299
+ if tp.is_file():
300
+ tp.unlink()
301
+ remove_tags(rel)
302
+ p.unlink()
303
+ freed += size
304
+ removed += 1
305
+
306
+ if not dry_run:
307
+ _cleanup_empty_dirs(config.images_dir)
308
+ _cleanup_empty_dirs(config.image_thumbnails_dir)
309
+
310
+ return {
311
+ "removed": removed,
312
+ "freed_mb": freed // (1024 * 1024),
313
+ "target_free_mb": target_free_mb,
314
+ "current_free_mb": current_free + (freed // (1024 * 1024)),
315
+ "done": (current_free + freed // (1024 * 1024)) >= target_free_mb,
316
+ "dry_run": dry_run,
317
+ }
318
+
319
+
320
+ def download_images_zip(paths: list[str]) -> io.BytesIO:
321
+ root = config.images_dir.resolve()
322
+ buf = io.BytesIO()
323
+ added = 0
324
+ used_names: set[str] = set()
325
+ with zipfile.ZipFile(buf, "w", zipfile.ZIP_DEFLATED) as zf:
326
+ for item in paths:
327
+ rel = _safe_relative_path(item)
328
+ path = (root / rel).resolve()
329
+ try:
330
+ path.relative_to(root)
331
+ except ValueError:
332
+ continue
333
+ if not path.is_file():
334
+ continue
335
+ name = path.name
336
+ if name in used_names:
337
+ stem = path.stem
338
+ suffix = path.suffix
339
+ counter = 2
340
+ while f"{stem}_{counter}{suffix}" in used_names:
341
+ counter += 1
342
+ name = f"{stem}_{counter}{suffix}"
343
+ used_names.add(name)
344
+ zf.write(path, name)
345
+ added += 1
346
+ if added == 0:
347
+ raise HTTPException(status_code=404, detail="no images found")
348
+ buf.seek(0)
349
+ return buf
350
+
351
+
352
+ def _auto_cleanup_worker(stop_event: threading.Event) -> None:
353
+ """后台线程:每30分钟检查存储,空间低于阈值自动清理最旧图片"""
354
+ import shutil
355
+ min_free_mb = getattr(config, "image_min_free_mb", None)
356
+ if min_free_mb is None:
357
+ min_free_mb = 500
358
+
359
+ while not stop_event.wait(1800): # 每30分钟
360
+ try:
361
+ config.cleanup_old_images()
362
+ cleanup_image_thumbnails()
363
+ usage = shutil.disk_usage(config.images_dir)
364
+ free_mb = usage.free // (1024 * 1024)
365
+ if free_mb < min_free_mb:
366
+ logger.info({"event": "image_auto_cleanup", "free_mb": free_mb, "min_free_mb": min_free_mb})
367
+ result = delete_to_target(min_free_mb)
368
+ logger.info({"event": "image_auto_cleanup_done", **result})
369
+ except Exception:
370
+ pass
371
+
372
+
373
+ def start_image_cleanup_scheduler(stop_event: threading.Event) -> threading.Thread:
374
+ t = threading.Thread(target=_auto_cleanup_worker, args=(stop_event,), daemon=True, name="image-cleanup")
375
+ t.start()
376
+ return t