Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some style preset follow-ups #6761

Merged
merged 2 commits into from
Aug 19, 2024
Merged

some style preset follow-ups #6761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c5e1a1
fix(api): allow updating of type for style preset
Aug 19, 2024
48e5e7b
fix(ui): properly unwrap delete style preset API request so that erro…
Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions invokeai/app/api/routers/style_presets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@
)


class StylePresetUpdateFormData(BaseModel):
class StylePresetFormData(BaseModel):
name: str = Field(description="Preset name")
positive_prompt: str = Field(description="Positive prompt")
negative_prompt: str = Field(description="Negative prompt")


class StylePresetCreateFormData(StylePresetUpdateFormData):
type: PresetType = Field(description="Preset type")


Expand Down Expand Up @@ -95,17 +92,18 @@ async def update_style_preset(

try:
parsed_data = json.loads(data)
validated_data = StylePresetUpdateFormData(**parsed_data)
validated_data = StylePresetFormData(**parsed_data)

name = validated_data.name
type = validated_data.type
positive_prompt = validated_data.positive_prompt
negative_prompt = validated_data.negative_prompt

except pydantic.ValidationError:
raise HTTPException(status_code=400, detail="Invalid preset data")

preset_data = PresetData(positive_prompt=positive_prompt, negative_prompt=negative_prompt)
changes = StylePresetChanges(name=name, preset_data=preset_data)
changes = StylePresetChanges(name=name, preset_data=preset_data, type=type)

style_preset_image = ApiDependencies.invoker.services.style_preset_image_files.get_url(style_preset_id)
style_preset = ApiDependencies.invoker.services.style_preset_records.update(
Expand Down Expand Up @@ -145,7 +143,7 @@ async def create_style_preset(

try:
parsed_data = json.loads(data)
validated_data = StylePresetCreateFormData(**parsed_data)
validated_data = StylePresetFormData(**parsed_data)

name = validated_data.name
type = validated_data.type
Expand Down
1 change: 1 addition & 0 deletions invokeai/app/services/style_preset_records/style_preset_records_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class PresetType(str, Enum, metaclass=MetaEnum):
class StylePresetChanges(BaseModel, extra="forbid"):
name: Optional[str] = Field(default=None, description="The style preset's new name.")
preset_data: Optional[PresetData] = Field(default=None, description="The updated data for style preset.")
type: Optional[PresetType] = Field(description="The updated type of the style preset")


class StylePresetWithoutId(BaseModel):
Expand Down
2 changes: 1 addition & 1 deletion invokeai/frontend/web/src/features/stylePresets/components/StylePresetListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const StylePresetListItem = ({ preset }: { preset: StylePresetRecordWithI

const handleDeletePreset = useCallback(async () => {
try {
await deleteStylePreset(preset.id);
await deleteStylePreset(preset.id).unwrap();
toast({
status: 'success',
title: t('stylePresets.templateDeleted'),
Expand Down
Loading