Skip to content

Commit 12f0ae1

Browse files
committed
remove changes from incorrect conflict resolution
1 parent dc2c12b commit 12f0ae1

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

src/diffusers/pipelines/free_noise_utils.py

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -192,42 +192,6 @@ def _check_inputs_free_noise(
192192
f"The maximum frame index in `prompt` dict must be lesser than {num_frames=} and follow 0-based indexing."
193193
)
194194

195-
def _check_inputs_free_noise(
196-
self,
197-
prompt,
198-
negative_prompt,
199-
prompt_embeds,
200-
negative_prompt_embeds,
201-
num_frames,
202-
) -> None:
203-
if not isinstance(prompt, (str, dict)):
204-
raise ValueError(f"Expected `prompt` to have type `str` or `dict` but found {type(prompt)=}")
205-
206-
if negative_prompt is not None:
207-
if not isinstance(negative_prompt, (str, dict)):
208-
raise ValueError(
209-
f"Expected `negative_prompt` to have type `str` or `dict` but found {type(negative_prompt)=}"
210-
)
211-
212-
if prompt_embeds is not None or negative_prompt_embeds is not None:
213-
raise ValueError("`prompt_embeds` and `negative_prompt_embeds` is not supported in FreeNoise yet.")
214-
215-
frame_indices = [isinstance(x, int) for x in prompt.keys()]
216-
frame_prompts = [isinstance(x, str) for x in prompt.values()]
217-
min_frame = min(list(prompt.keys()))
218-
max_frame = max(list(prompt.keys()))
219-
220-
if not all(frame_indices):
221-
raise ValueError("Expected integer keys in `prompt` dict for FreeNoise.")
222-
if not all(frame_prompts):
223-
raise ValueError("Expected str values in `prompt` dict for FreeNoise.")
224-
if min_frame != 0:
225-
raise ValueError("The minimum frame index in `prompt` dict must be 0 as a starting prompt is necessary.")
226-
if max_frame >= num_frames:
227-
raise ValueError(
228-
f"The maximum frame index in `prompt` dict must be lesser than {num_frames=} and follow 0-based indexing."
229-
)
230-
231195
def _encode_prompt_free_noise(
232196
self,
233197
prompt: Union[str, Dict[int, str]],

0 commit comments

Comments
 (0)