Skip to content

add loras/embeddings for ponydiffusion #229

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add loras/embeddings for ponydiffusion #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 20 additions & 4 deletions app/_modules/AdvancedOptionsPanel/EmbeddingsSelect/EmbeddingSearchModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@ const searchRequest = async ({
page = 1,
nsfw = false,
sdxl = false,
pony = false,
sd15 = false,
sd21 = false
}: {
input?: string
page?: number
nsfw?: boolean
sdxl?: boolean
pony?: boolean
sd15?: boolean
sd21?: boolean
}) => {
Expand All @@ -65,14 +67,15 @@ const searchRequest = async ({
// Per this discussion on GitHub, this is an undocumented feature:
// https://github.com/orgs/civitai/discussions/733
// API response gives me the following valid values:
// "'SD 1.4' | 'SD 1.5' | 'SD 1.5 LCM' | 'SD 2.0' | 'SD 2.0 768' | 'SD 2.1' | 'SD 2.1 768' | 'SD 2.1 Unclip' | 'SDXL 0.9' | 'SDXL 1.0' | 'SDXL 1.0 LCM' | 'SDXL Distilled' | 'SDXL Turbo' | 'SVD' | 'SVD XT' | 'Playground v2' | 'PixArt a' | 'Other'"
// "'SD 1.4' | 'SD 1.5' | 'SD 1.5 LCM' | 'SD 2.0' | 'SD 2.0 768' | 'SD 2.1' | 'SD 2.1 768' | 'SD 2.1 Unclip' | 'SDXL 0.9' | 'SDXL 1.0' | 'Pony' | 'SDXL 1.0 LCM' | 'SDXL Distilled' | 'SDXL Turbo' | 'SDXL Lightning' | 'Stable Cascade' | 'SVD' | 'SVD XT' | 'Playground v2' | 'PixArt a' | 'Other'"
let baseModelFilter

baseModelFilter = sdxl
? ['0.9', '1.0', '1.0 LCM', 'Turbo']
.map((e) => '&baseModels=SDXL ' + e)
.join('')
: ''
baseModelFilter += pony ? '&baseModels=Pony' : ''
baseModelFilter += sd15
? ['1.4', '1.5', '1.5 LCM'].map((e) => '&baseModels=SD ' + e).join('')
: ''
Expand Down Expand Up @@ -130,6 +133,7 @@ const EmbeddingSearchModal = ({
const [showOptionsMenu, setShowOptionsMenu] = useState(false)
const [showNsfw, setShowNsfw] = useState(AppSettings.get('civitaiShowNsfw'))
const [showSDXL, setShowSDXL] = useState(AppSettings.get('civitaiShowSDXL'))
const [showPony, setShowPony] = useState(AppSettings.get('civitaiShowPony'))
const [showSD15, setShowSD15] = useState(AppSettings.get('civitaiShowSD15'))
const [showSD21, setShowSD21] = useState(AppSettings.get('civitaiShowSD21'))
const [currentPage, setCurrentPage] = useState(1)
Expand All @@ -146,6 +150,7 @@ const EmbeddingSearchModal = ({
input,
nsfw: showNsfw,
sdxl: showSDXL,
pony: showPony,
sd15: showSD15,
sd21: showSD21,
page: currentPage
Expand All @@ -161,7 +166,7 @@ const EmbeddingSearchModal = ({
setHasError('Unable to load data from CivitAI, please try again shortly.')
}
setLoading(false)
}, [currentPage, input, showNsfw, showSDXL, showSD15, showSD21])
}, [currentPage, input, showNsfw, showSDXL, showPony, showSD15, showSD21])

const fetchModels = useCallback(async () => {
setLoading(true)
Expand All @@ -170,6 +175,7 @@ const EmbeddingSearchModal = ({
page: 1,
nsfw: showNsfw,
sdxl: showSDXL,
pony: showPony,
sd15: showSD15,
sd21: showSD21
})
Expand All @@ -183,7 +189,7 @@ const EmbeddingSearchModal = ({
setTotalPages(metadata.totalPages)

setLoading(false)
}, [input, showNsfw, showSDXL, showSD15, showSD21])
}, [input, showNsfw, showSDXL, showPony, showSD15, showSD21])

const handleInputChange = async (
event: React.ChangeEvent<HTMLInputElement>
Expand All @@ -204,7 +210,7 @@ const EmbeddingSearchModal = ({
useEffect(() => {
debouncedFetchModels()
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [currentPage, input, showNsfw, showSDXL, showSD15, showSD21])
}, [currentPage, input, showNsfw, showSDXL, showPony, showSD15, showSD21])

return (
<>
Expand Down Expand Up @@ -275,6 +281,16 @@ const EmbeddingSearchModal = ({
}}
/>
</div>
<div style={{ padding: '8px 0' }}>
<Checkbox
label="Show PonyDiffusion XL embeddings? (May not work properly with models on Horde)"
checked={showPony}
onChange={(bool: boolean) => {
AppSettings.set('civitaiShowPony', bool)
setShowPony(bool)
}}
/>
</div>
<div style={{ padding: '8px 0' }}>
<Checkbox
label="Show SD15 embeddings?"
Expand Down
24 changes: 20 additions & 4 deletions app/_modules/AdvancedOptionsPanel/LoraSelect/modals/LoraSearchModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,15 @@ const searchRequest = async ({
input,
page = 1,
nsfw = false,
pony = false,
sdxl = false,
sd15 = false,
sd21 = false
}: {
input?: string
page?: number
nsfw?: boolean
pony?: boolean
sdxl?: boolean
sd15?: boolean
sd21?: boolean
Expand All @@ -64,14 +66,15 @@ const searchRequest = async ({
// Per this discussion on GitHub, this is an undocumented feature:
// https://github.com/orgs/civitai/discussions/733
// API response gives me the following valid values:
// "'SD 1.4' | 'SD 1.5' | 'SD 1.5 LCM' | 'SD 2.0' | 'SD 2.0 768' | 'SD 2.1' | 'SD 2.1 768' | 'SD 2.1 Unclip' | 'SDXL 0.9' | 'SDXL 1.0' | 'SDXL 1.0 LCM' | 'SDXL Distilled' | 'SDXL Turbo' | 'SVD' | 'SVD XT' | 'Playground v2' | 'PixArt a' | 'Other'"
// "'SD 1.4' | 'SD 1.5' | 'SD 1.5 LCM' | 'SD 2.0' | 'SD 2.0 768' | 'SD 2.1' | 'SD 2.1 768' | 'SD 2.1 Unclip' | 'SDXL 0.9' | 'SDXL 1.0' | 'Pony' | 'SDXL 1.0 LCM' | 'SDXL Distilled' | 'SDXL Turbo' | 'SDXL Lightning' | 'Stable Cascade' | 'SVD' | 'SVD XT' | 'Playground v2' | 'PixArt a' | 'Other'"
let baseModelFilter

baseModelFilter = sdxl
? ['0.9', '1.0', '1.0 LCM', 'Turbo']
.map((e) => '&baseModels=SDXL ' + e)
.join('')
: ''
baseModelFilter += pony ? '&baseModels=Pony' : ''
baseModelFilter += sd15
? ['1.4', '1.5', '1.5 LCM'].map((e) => '&baseModels=SD ' + e).join('')
: ''
Expand Down Expand Up @@ -130,6 +133,7 @@ const LoraSearchModal = ({
const [showOptionsMenu, setShowOptionsMenu] = useState(false)
const [showNsfw, setShowNsfw] = useState(AppSettings.get('civitaiShowNsfw'))
const [showSDXL, setShowSDXL] = useState(AppSettings.get('civitaiShowSDXL'))
const [showPony, setShowPony] = useState(AppSettings.get('civitaiShowPony'))
const [showSD15, setShowSD15] = useState(AppSettings.get('civitaiShowSD15'))
const [showSD21, setShowSD21] = useState(AppSettings.get('civitaiShowSD21'))
const [currentPage, setCurrentPage] = useState(1)
Expand All @@ -146,6 +150,7 @@ const LoraSearchModal = ({
input,
nsfw: showNsfw,
sdxl: showSDXL,
pony: showPony,
sd15: showSD15,
sd21: showSD21,
page: currentPage
Expand All @@ -161,7 +166,7 @@ const LoraSearchModal = ({
setHasError('Unable to load data from CivitAI, please try again shortly.')
}
setLoading(false)
}, [currentPage, input, showNsfw, showSDXL, showSD15, showSD21])
}, [currentPage, input, showNsfw, showSDXL, showPony, showSD15, showSD21])

const fetchModels = useCallback(async () => {
setLoading(true)
Expand All @@ -170,6 +175,7 @@ const LoraSearchModal = ({
page: 1,
nsfw: showNsfw,
sdxl: showSDXL,
pony: showPony,
sd15: showSD15,
sd21: showSD21
})
Expand All @@ -183,7 +189,7 @@ const LoraSearchModal = ({
setTotalPages(metadata.totalPages)

setLoading(false)
}, [input, showNsfw, showSDXL, showSD15, showSD21])
}, [input, showNsfw, showSDXL, showPony, showSD15, showSD21])

const handleInputChange = async (
event: React.ChangeEvent<HTMLInputElement>
Expand All @@ -204,7 +210,7 @@ const LoraSearchModal = ({
useEffect(() => {
debouncedFetchModels()
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [currentPage, input, showNsfw, showSDXL, showSD15, showSD21])
}, [currentPage, input, showNsfw, showSDXL, showPony, showSD15, showSD21])

return (
<div id="lora-search-modal">
Expand Down Expand Up @@ -275,6 +281,16 @@ const LoraSearchModal = ({
}}
/>
</div>
<div style={{ padding: '8px 0' }}>
<Checkbox
label="Show PonyDiffusion XL Loras? (May not work properly with models on Horde)"
checked={showPony}
onChange={(bool: boolean) => {
AppSettings.set('civitaiShowPony', bool)
setShowPony(bool)
}}
/>
</div>
<div style={{ padding: '8px 0' }}>
<Checkbox
label="Show SD15 LORAS?"
Expand Down