Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/celpy/evaluation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3059,6 +3059,8 @@ def __init__(
self.base_activation = activation
self.activation = self.base_activation

self.fn_packages = self._resolve_fn_packages()

self.logger.debug("Transpiler activation: %r", self.activation)
# self.logger.debug("functions: %r", self.functions) # Refactor ``self.functions`` into an Activation

Expand Down Expand Up @@ -3090,7 +3092,7 @@ def evaluate(self, context: Context) -> celpy.celtypes.Value:

# Global for the top-level ``CEL = result(base_activation, ...)`` statement.
evaluation_globals = (
celpy.evaluation.result.__globals__
celpy.evaluation.result.__globals__ | self.fn_packages
) # the ``evaluation`` moodule
evaluation_globals["base_activation"] = self.activation
try:
Expand All @@ -3104,6 +3106,17 @@ def evaluate(self, context: Context) -> celpy.celtypes.Value:
self.logger.error("Internal error: %r", ex)
raise CELEvalError("evaluation error", type(ex), ex.args)

def _resolve_fn_packages(self):
result = {}
for _, f in self.base_activation.functions.items():
package = f.__module__.split('.', 1)[0]
if package in result:
continue

result[package] = sys.modules[package]

return result


class Phase1Transpiler(lark.visitors.Visitor_Recursive):
"""
Expand Down