fffiloni commited on
Commit
270734d
·
verified ·
1 Parent(s): a7ee9da

Update app_zero.py

Browse files
Files changed (1) hide show
  1. app_zero.py +23 -9
app_zero.py CHANGED
@@ -1,7 +1,5 @@
1
  import sys
2
- import os
3
  import types
4
- import random
5
  import datetime
6
  from pathlib import Path
7
 
@@ -96,7 +94,6 @@ def patch_file(path_str: str, replacements: list[tuple[str, str]]) -> None:
96
  return
97
 
98
  original = text
99
-
100
  for old, new in replacements:
101
  text = text.replace(old, new)
102
 
@@ -122,7 +119,7 @@ def patch_pasd_for_diffusers() -> None:
122
  ],
123
  )
124
 
125
- # 2) PositionNet -> GLIGENTextBoundingboxProjection alias
126
  patch_file(
127
  "./PASD/models/pasd/unet_2d_condition.py",
128
  [
@@ -153,21 +150,38 @@ def patch_pasd_for_diffusers() -> None:
153
  ],
154
  )
155
 
156
- # 4) normalize ControlNet loader import for diffusers 0.27.x
 
 
 
 
 
 
 
 
 
157
  patch_file(
158
  "./PASD/models/pasd/controlnet.py",
159
  [
160
  (
161
- "from diffusers.loaders.single_file_model import FromOriginalModelMixin as FromOriginalControlnetMixin",
162
  "from diffusers.loaders import FromOriginalControlnetMixin",
 
 
 
 
 
 
 
 
 
163
  ),
164
  (
165
  "from diffusers.loaders.single_file_model import FromOriginalModelMixin as FromOriginalControlNetMixin",
166
- "from diffusers.loaders import FromOriginalControlnetMixin",
167
  ),
168
  (
169
- "from diffusers.loaders import FromOriginalControlNetMixin",
170
- "from diffusers.loaders import FromOriginalControlnetMixin",
171
  ),
172
  ],
173
  )
 
1
  import sys
 
2
  import types
 
3
  import datetime
4
  from pathlib import Path
5
 
 
94
  return
95
 
96
  original = text
 
97
  for old, new in replacements:
98
  text = text.replace(old, new)
99
 
 
119
  ],
120
  )
121
 
122
+ # 2) PositionNet was replaced by GLIGENTextBoundingboxProjection
123
  patch_file(
124
  "./PASD/models/pasd/unet_2d_condition.py",
125
  [
 
150
  ],
151
  )
152
 
153
+ # 4) robust ControlNet mixin import fallback
154
+ controlnet_import_fallback = '''try:
155
+ from diffusers.loaders import FromOriginalControlNetMixin as FromOriginalControlnetMixin
156
+ except ImportError:
157
+ try:
158
+ from diffusers.loaders import FromOriginalControlnetMixin
159
+ except ImportError:
160
+ class FromOriginalControlnetMixin:
161
+ pass'''
162
+
163
  patch_file(
164
  "./PASD/models/pasd/controlnet.py",
165
  [
166
  (
 
167
  "from diffusers.loaders import FromOriginalControlnetMixin",
168
+ controlnet_import_fallback,
169
+ ),
170
+ (
171
+ "from diffusers.loaders import FromOriginalControlNetMixin",
172
+ controlnet_import_fallback,
173
+ ),
174
+ (
175
+ "from diffusers.loaders.single_file_model import FromOriginalModelMixin as FromOriginalControlnetMixin",
176
+ controlnet_import_fallback,
177
  ),
178
  (
179
  "from diffusers.loaders.single_file_model import FromOriginalModelMixin as FromOriginalControlNetMixin",
180
+ controlnet_import_fallback,
181
  ),
182
  (
183
+ "FromOriginalControlNetMixin",
184
+ "FromOriginalControlnetMixin",
185
  ),
186
  ],
187
  )