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

Skip list logic if the list only contains primitives

Browse Source
This commit is contained in:
Brandon Rising 2024-03-11 14:36:56 -04:00 committed by Mary Hipp Rogers
parent 97afa6e2a6
commit 46fd3465ce
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
invokeai/app/services/config/config_base.py
View File

@ -18,7 +18,7 @@ from pathlib import Path
from pydantic import BaseModel from pydantic import BaseModel
from typing import Any, ClassVar, Dict, List, Literal, Optional, Union, get_args, get_origin, get_type_hints from typing import Any, ClassVar, Dict, List, Literal, Optional, Union, get_args, get_origin, get_type_hints
from omegaconf import DictConfig, ListConfig, OmegaConf from omegaconf import DictConfig, ListConfig, OmegaConf, DictKeyType
from pydantic_settings import BaseSettings, SettingsConfigDict from pydantic_settings import BaseSettings, SettingsConfigDict
from invokeai.app.services.config.config_common import PagingArgumentParser, int_or_float_or_str from invokeai.app.services.config.config_common import PagingArgumentParser, int_or_float_or_str
@ -68,13 +68,17 @@ class InvokeAISettings(BaseSettings):
field_dict[type][category][name] = dump field_dict[type][category][name] = dump
continue continue
if isinstance(value, list): if isinstance(value, list):
val_list: List[Dict[str, Any]] = [] if not value or len(value) == 0:
for list_val in value: continue
if isinstance(list_val, BaseModel): primitive = isinstance(value[0], get_args(DictKeyType))
dump = list_val.model_dump(exclude_defaults=True, exclude_unset=True, exclude_none=True) if not primitive:
val_list.append(dump) val_list: List[Dict[str, Any]] = []
field_dict[type][category][name] = val_list for list_val in value:
continue if isinstance(list_val, BaseModel):
dump = list_val.model_dump(exclude_defaults=True, exclude_unset=True, exclude_none=True)
val_list.append(dump)
field_dict[type][category][name] = val_list
continue
# keep paths as strings to make it easier to read # keep paths as strings to make it easier to read
field_dict[type][category][name] = str(value) if isinstance(value, Path) else value field_dict[type][category][name] = str(value) if isinstance(value, Path) else value
conf = OmegaConf.create(field_dict) conf = OmegaConf.create(field_dict)