From c953e61294a7dbdd27e3511bf8011f2a5926bd8b Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:10:18 +1100 Subject: [PATCH] tidy(mm): "trigger_words" -> "trigger_phrases" --- .../app/services/model_install/model_install_default.py | 4 ++-- .../shared/sqlite_migrator/migrations/migration_7.py | 2 +- invokeai/backend/model_manager/config.py | 2 +- invokeai/backend/model_manager/metadata/fetch/civitai.py | 6 +++--- invokeai/backend/model_manager/metadata/metadata_base.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/invokeai/app/services/model_install/model_install_default.py b/invokeai/app/services/model_install/model_install_default.py index e12a499648..1d68808ec1 100644 --- a/invokeai/app/services/model_install/model_install_default.py +++ b/invokeai/app/services/model_install/model_install_default.py @@ -379,8 +379,8 @@ class ModelInstallService(ModelInstallServiceBase): # enter the metadata, if there is any if isinstance(job.source_metadata, (CivitaiMetadata, HuggingFaceMetadata)): job.config_in["source_api_response"] = job.source_metadata.api_response - if isinstance(job.source_metadata, CivitaiMetadata) and job.source_metadata.trigger_words: - job.config_in["trigger_words"] = job.source_metadata.trigger_words + if isinstance(job.source_metadata, CivitaiMetadata) and job.source_metadata.trigger_phrases: + job.config_in["trigger_phrases"] = job.source_metadata.trigger_phrases if job.inplace: key = self.register_path(job.local_path, job.config_in) diff --git a/invokeai/app/services/shared/sqlite_migrator/migrations/migration_7.py b/invokeai/app/services/shared/sqlite_migrator/migrations/migration_7.py index bb33609c27..6f5ddbf561 100644 --- a/invokeai/app/services/shared/sqlite_migrator/migrations/migration_7.py +++ b/invokeai/app/services/shared/sqlite_migrator/migrations/migration_7.py @@ -33,7 +33,7 @@ class Migration7Callback: 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_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 config TEXT NOT NULL, created_at DATETIME NOT NULL DEFAULT(STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), diff --git a/invokeai/backend/model_manager/config.py b/invokeai/backend/model_manager/config.py index f1733ed79a..2e2595b5f0 100644 --- a/invokeai/backend/model_manager/config.py +++ b/invokeai/backend/model_manager/config.py @@ -147,7 +147,7 @@ class ModelConfigBase(BaseModel): source_api_response: Optional[str] = Field( 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) diff --git a/invokeai/backend/model_manager/metadata/fetch/civitai.py b/invokeai/backend/model_manager/metadata/fetch/civitai.py index 7a79dfa651..98bb286b0a 100644 --- a/invokeai/backend/model_manager/metadata/fetch/civitai.py +++ b/invokeai/backend/model_manager/metadata/fetch/civitai.py @@ -144,14 +144,14 @@ class CivitaiMetadataFetch(ModelMetadataFetchBase): ] try: - trigger_words = StringSetAdapter.validate_python(version_json.get("trainedWords")) + trigger_phrases = StringSetAdapter.validate_python(version_json.get("trainedWords")) except ValidationError: - trigger_words: set[str] = set() + trigger_phrases: set[str] = set() return CivitaiMetadata( name=version_json["name"], files=model_files, - trigger_words=trigger_words, + trigger_phrases=trigger_phrases, api_response=json.dumps(version_json), ) diff --git a/invokeai/backend/model_manager/metadata/metadata_base.py b/invokeai/backend/model_manager/metadata/metadata_base.py index 54c6c91e11..93d585b6b7 100644 --- a/invokeai/backend/model_manager/metadata/metadata_base.py +++ b/invokeai/backend/model_manager/metadata/metadata_base.py @@ -92,7 +92,7 @@ class CivitaiMetadata(ModelMetadataWithFiles): """Extended metadata fields provided by 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)