This commit is contained in:
Timothy J. Baek 2024-06-01 14:34:48 -07:00
parent 3719644c63
commit a248b96dba

19
main.py
View File

@ -144,16 +144,17 @@ async def load_modules_from_directory(directory):
if os.path.exists(valves_json_path): if os.path.exists(valves_json_path):
with open(valves_json_path, "r") as f: with open(valves_json_path, "r") as f:
valves_json = json.load(f) valves_json = json.load(f)
ValvesModel = pipeline.valves.__class__ if hasattr(pipeline, "valves"):
# Create a ValvesModel instance using default values and overwrite with valves_json ValvesModel = pipeline.valves.__class__
combined_valves = { # Create a ValvesModel instance using default values and overwrite with valves_json
**pipeline.valves.model_dump(), combined_valves = {
**valves_json, **pipeline.valves.model_dump(),
} **valves_json,
valves = ValvesModel(**combined_valves) }
pipeline.valves = valves valves = ValvesModel(**combined_valves)
pipeline.valves = valves
logging.info(f"Updated valves for module: {module_name}") logging.info(f"Updated valves for module: {module_name}")
pipeline_id = pipeline.id if hasattr(pipeline, "id") else module_name pipeline_id = pipeline.id if hasattr(pipeline, "id") else module_name
PIPELINE_MODULES[pipeline_id] = pipeline PIPELINE_MODULES[pipeline_id] = pipeline