refactor: Update instantiate_class function to support CustomComponent and Component inheritance
This commit is contained in:
parent
fe032f3830
commit
7eeb6ea78a
1 changed files with 5 additions and 5 deletions
|
|
@ -2,7 +2,7 @@ import inspect
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import warnings
|
import warnings
|
||||||
from typing import TYPE_CHECKING, Any, Type
|
from typing import TYPE_CHECKING, Any
|
||||||
|
|
||||||
import orjson
|
import orjson
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
|
|
@ -36,8 +36,8 @@ async def instantiate_class(
|
||||||
|
|
||||||
params_copy = params.copy()
|
params_copy = params.copy()
|
||||||
# Remove code from params
|
# Remove code from params
|
||||||
class_object: Type["CustomComponent"] = eval_custom_component_code(params_copy.pop("code"))
|
class_object = eval_custom_component_code(params_copy.pop("code"))
|
||||||
custom_component: "CustomComponent" | "Component" = class_object(
|
custom_component = class_object(
|
||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
parameters=params_copy,
|
parameters=params_copy,
|
||||||
vertex=vertex,
|
vertex=vertex,
|
||||||
|
|
@ -47,9 +47,9 @@ async def instantiate_class(
|
||||||
)
|
)
|
||||||
with warnings.catch_warnings():
|
with warnings.catch_warnings():
|
||||||
warnings.filterwarnings("ignore", category=PydanticDeprecatedSince20)
|
warnings.filterwarnings("ignore", category=PydanticDeprecatedSince20)
|
||||||
if issubclass(class_object, Component):
|
if isinstance(custom_component, Component):
|
||||||
return await build_component(params=params_copy, custom_component=custom_component, vertex=vertex)
|
return await build_component(params=params_copy, custom_component=custom_component, vertex=vertex)
|
||||||
elif issubclass(class_object, CustomComponent):
|
elif isinstance(custom_component, CustomComponent):
|
||||||
return await build_custom_component(params=params_copy, custom_component=custom_component)
|
return await build_custom_component(params=params_copy, custom_component=custom_component)
|
||||||
else:
|
else:
|
||||||
raise ValueError(f"Base type {base_type} not found.")
|
raise ValueError(f"Base type {base_type} not found.")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue