Make smart call deduplication
This commit is contained in:
@@ -51,6 +51,28 @@ class ConversionArgRenderData:
|
||||
typehash: str
|
||||
|
||||
|
||||
def deduplicate_callseq(conversion_models: list[ConversionRenderData]) -> list[ConversionRenderData]:
|
||||
deduplicated_conv_models: list[ConversionRenderData] = []
|
||||
for conv_model in conversion_models:
|
||||
if conv_model not in deduplicated_conv_models:
|
||||
deduplicated_conv_models.append(conv_model)
|
||||
continue
|
||||
|
||||
argnames = list(map(lambda x: x[1], conv_model.funcargs))
|
||||
argument_changed = False
|
||||
found_model = False
|
||||
for m in deduplicated_conv_models:
|
||||
if not found_model and m == conv_model:
|
||||
found_model = True
|
||||
|
||||
if found_model and m.inj_hash in argnames:
|
||||
argument_changed = True
|
||||
break
|
||||
if argument_changed:
|
||||
deduplicated_conv_models.append(conv_model)
|
||||
return deduplicated_conv_models
|
||||
|
||||
|
||||
class InTimeGenerationConvertorRenderer(ConvertorRenderer):
|
||||
templateLoader: jinja2.BaseLoader
|
||||
templateEnv: jinja2.Environment
|
||||
@@ -72,7 +94,7 @@ class InTimeGenerationConvertorRenderer(ConvertorRenderer):
|
||||
force_async: bool = False) -> Callable:
|
||||
|
||||
fnmap = {}
|
||||
conversion_models = []
|
||||
conversion_models: list[ConversionRenderData] = []
|
||||
ret_hash = 0
|
||||
is_async = force_async
|
||||
for call_id, call in enumerate(callseq):
|
||||
@@ -84,12 +106,13 @@ class InTimeGenerationConvertorRenderer(ConvertorRenderer):
|
||||
|
||||
fnmap[hash(call.fn)] = call.fn
|
||||
conv = ConversionRenderData.from_inj(call, provided_types)
|
||||
if conv not in conversion_models:
|
||||
conversion_models.append(conv)
|
||||
if call.is_async:
|
||||
is_async = True
|
||||
conversion_models.append(conv)
|
||||
if call.is_async:
|
||||
is_async = True
|
||||
|
||||
ret_hash = hash(callseq[-1].injects)
|
||||
conversion_models = deduplicate_callseq(conversion_models)
|
||||
|
||||
ret_hash = hashname(callseq[-1].injects)
|
||||
|
||||
conv_args = []
|
||||
for i, from_type in enumerate(from_types):
|
||||
|
||||
Reference in New Issue
Block a user