Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidy(mm): "trigger_words" -> "trigger_phrases"

Browse Source
This commit is contained in:
psychedelicious 2024-03-05 11:10:18 +11:00
parent 93dd3c848e
commit c953e61294
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/app/services/model_install/model_install_default.py
View File

@ -379,8 +379,8 @@ class ModelInstallService(ModelInstallServiceBase):
# enter the metadata, if there is any # enter the metadata, if there is any
if isinstance(job.source_metadata, (CivitaiMetadata, HuggingFaceMetadata)): if isinstance(job.source_metadata, (CivitaiMetadata, HuggingFaceMetadata)):
job.config_in["source_api_response"] = job.source_metadata.api_response job.config_in["source_api_response"] = job.source_metadata.api_response
if isinstance(job.source_metadata, CivitaiMetadata) and job.source_metadata.trigger_words: if isinstance(job.source_metadata, CivitaiMetadata) and job.source_metadata.trigger_phrases:
job.config_in["trigger_words"] = job.source_metadata.trigger_words job.config_in["trigger_phrases"] = job.source_metadata.trigger_phrases
if job.inplace: if job.inplace:
key = self.register_path(job.local_path, job.config_in) key = self.register_path(job.local_path, job.config_in)

2
invokeai/app/services/shared/sqlite_migrator/migrations/migration_7.py
View File

@ -33,7 +33,7 @@ class Migration7Callback:
source TEXT GENERATED ALWAYS as (json_extract(config, '$.source')) VIRTUAL NOT NULL, source TEXT GENERATED ALWAYS as (json_extract(config, '$.source')) VIRTUAL NOT NULL,
source_type TEXT GENERATED ALWAYS as (json_extract(config, '$.source_type')) VIRTUAL NOT NULL, source_type TEXT GENERATED ALWAYS as (json_extract(config, '$.source_type')) VIRTUAL NOT NULL,
source_api_response TEXT GENERATED ALWAYS as (json_extract(config, '$.source_api_response')) VIRTUAL, source_api_response TEXT GENERATED ALWAYS as (json_extract(config, '$.source_api_response')) VIRTUAL,
trigger_words TEXT GENERATED ALWAYS as (json_extract(config, '$.trigger_words')) VIRTUAL, trigger_phrases TEXT GENERATED ALWAYS as (json_extract(config, '$.trigger_phrases')) VIRTUAL,
-- Serialized JSON representation of the whole config object, which will contain additional fields from subclasses -- Serialized JSON representation of the whole config object, which will contain additional fields from subclasses
config TEXT NOT NULL, config TEXT NOT NULL,
created_at DATETIME NOT NULL DEFAULT(STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), created_at DATETIME NOT NULL DEFAULT(STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')),

2
invokeai/backend/model_manager/config.py
View File

@ -147,7 +147,7 @@ class ModelConfigBase(BaseModel):
source_api_response: Optional[str] = Field( source_api_response: Optional[str] = Field(
description="The original API response from the source, as stringified JSON.", default=None description="The original API response from the source, as stringified JSON.", default=None
) )
trigger_words: Optional[set[str]] = Field(description="Set of trigger words for this model", default=None) trigger_phrases: Optional[set[str]] = Field(description="Set of trigger phrases for this model", default=None)
model_config = ConfigDict(use_enum_values=False, validate_assignment=True) model_config = ConfigDict(use_enum_values=False, validate_assignment=True)

6
invokeai/backend/model_manager/metadata/fetch/civitai.py
View File

@ -144,14 +144,14 @@ class CivitaiMetadataFetch(ModelMetadataFetchBase):
] ]
try: try:
trigger_words = StringSetAdapter.validate_python(version_json.get("trainedWords")) trigger_phrases = StringSetAdapter.validate_python(version_json.get("trainedWords"))
except ValidationError: except ValidationError:
trigger_words: set[str] = set() trigger_phrases: set[str] = set()
return CivitaiMetadata( return CivitaiMetadata(
name=version_json["name"], name=version_json["name"],
files=model_files, files=model_files,
trigger_words=trigger_words, trigger_phrases=trigger_phrases,
api_response=json.dumps(version_json), api_response=json.dumps(version_json),
) )

2
invokeai/backend/model_manager/metadata/metadata_base.py
View File

@ -92,7 +92,7 @@ class CivitaiMetadata(ModelMetadataWithFiles):
"""Extended metadata fields provided by Civitai.""" """Extended metadata fields provided by Civitai."""
type: Literal["civitai"] = "civitai" type: Literal["civitai"] = "civitai"
trigger_words: set[str] = Field(description="Trigger words extracted from the API response") trigger_phrases: set[str] = Field(description="Trigger phrases extracted from the API response")
api_response: Optional[str] = Field(description="Response from the Civitai API as stringified JSON", default=None) api_response: Optional[str] = Field(description="Response from the Civitai API as stringified JSON", default=None)