ripple-down-rules 0.4.7__py3-none-any.whl → 0.4.9__py3-none-any.whl

ripple_down_rules/rdr_decorators.py

@@ -5,15 +5,17 @@ of the RDRs.
 """
 import os.path
 from functools import wraps
+
+from pyparsing.tools.cvt_pyparsing_pep8_names import camel_to_snake
 from typing_extensions import Callable, Optional, Type, Tuple, Dict, Any, Self, get_type_hints, List, Union
 
-from ripple_down_rules.datastructures.case import create_case
+from ripple_down_rules.datastructures.case import create_case, Case
 from ripple_down_rules.datastructures.dataclasses import CaseQuery
 from ripple_down_rules.datastructures.enums import Category
 from ripple_down_rules.experts import Expert, Human
 from ripple_down_rules.rdr import GeneralRDR, RippleDownRules
 from ripple_down_rules.utils import get_method_args_as_dict, get_func_rdr_model_name, make_set, \
-    get_method_class_if_exists
+    get_method_class_if_exists, get_method_name, str_to_snake_case
 
 
 class RDRDecorator:
@@ -41,99 +43,118 @@ class RDRDecorator:
         :return: A decorator to use a GeneralRDR as a classifier that monitors and modifies the function's output.
         """
         self.rdr_models_dir = models_dir
+        self.model_name: Optional[str] = None
         self.output_type = output_type
         self.parsed_output_type: List[Type] = []
         self.mutual_exclusive = mutual_exclusive
         self.rdr_python_path: Optional[str] = python_dir
         self.output_name = output_name
         self.fit: bool = fit
-        self.expert = expert if expert else Human()
-        self.rdr_model_path: Optional[str] = None
+        self.expert: Optional[Expert] = expert
         self.load()
 
     def decorator(self, func: Callable) -> Callable:
 
         @wraps(func)
         def wrapper(*args, **kwargs) -> Optional[Any]:
+
             if len(self.parsed_output_type) == 0:
-                self.parse_output_type(func, *args)
-            if self.rdr_model_path is None:
-                self.initialize_rdr_model_path_and_load(func)
-            case_dict = get_method_args_as_dict(func, *args, **kwargs)
-            func_output = func(*args, **kwargs)
-            case_dict.update({self.output_name: func_output})
-            case = create_case(case_dict, obj_name=get_func_rdr_model_name(func), max_recursion_idx=3)
+                self.parsed_output_type = self.parse_output_type(func, self.output_type, *args)
+            if self.model_name is None:
+                self.initialize_rdr_model_name_and_load(func)
+
             if self.fit:
-                scope = func.__globals__
-                scope.update(case_dict)
-                func_args_type_hints = get_type_hints(func)
-                func_args_type_hints.update({self.output_name: Union[tuple(self.parsed_output_type)]})
-                case_query = CaseQuery(case, self.output_name, Union[tuple(self.parsed_output_type)],
-                                       self.mutual_exclusive,
-                                       scope=scope, is_function=True, function_args_type_hints=func_args_type_hints)
+                expert_answers_path = os.path.join(self.rdr_models_dir, self.model_name, "expert_answers")
+                self.expert = self.expert or Human(answers_save_path=expert_answers_path)
+                case_query = self.create_case_query_from_method(func, self.parsed_output_type,
+                                                                self.mutual_exclusive, self.output_name,
+                                                                *args, **kwargs)
                 output = self.rdr.fit_case(case_query, expert=self.expert)
                 return output[self.output_name]
             else:
+                case, case_dict = self.create_case_from_method(func, self.output_name, *args, **kwargs)
                 return self.rdr.classify(case)[self.output_name]
 
         return wrapper
 
-    def initialize_rdr_model_path_and_load(self, func: Callable) -> None:
+    @staticmethod
+    def create_case_query_from_method(func: Callable, output_type, mutual_exclusive: bool,
+                                output_name: str = 'output_', *args, **kwargs) -> CaseQuery:
+        """
+        Create a CaseQuery from the function and its arguments.
+
+        :param func: The function to create a case from.
+        :param output_type: The type of the output.
+        :param mutual_exclusive: If True, the output types are mutually exclusive.
+        :param output_name: The name of the output in the case. Defaults to 'output_'.
+        :param args: The positional arguments of the function.
+        :param kwargs: The keyword arguments of the function.
+        :return: A CaseQuery object representing the case.
+        """
+        output_type = make_set(output_type)
+        case, case_dict = RDRDecorator.create_case_from_method(func, output_name, *args, **kwargs)
+        scope = func.__globals__
+        scope.update(case_dict)
+        func_args_type_hints = get_type_hints(func)
+        func_args_type_hints.update({output_name: Union[tuple(output_type)]})
+        return CaseQuery(case, output_name, Union[tuple(output_type)],
+                         mutual_exclusive, scope=scope,
+                         is_function=True, function_args_type_hints=func_args_type_hints)
+
+    @staticmethod
+    def create_case_from_method(func: Callable, output_name: str = "output_", *args, **kwargs) -> Tuple[Case, Dict[str, Any]]:
+        """
+        Create a Case from the function and its arguments.
+
+        :param func: The function to create a case from.
+        :param output_name: The name of the output in the case. Defaults to 'output_'.
+        :param args: The positional arguments of the function.
+        :param kwargs: The keyword arguments of the function.
+        :return: A Case object representing the case.
+        """
+        case_dict = get_method_args_as_dict(func, *args, **kwargs)
+        func_output = func(*args, **kwargs)
+        case_dict.update({output_name: func_output})
+        case_name = get_func_rdr_model_name(func)
+        return create_case(case_dict, obj_name=case_name, max_recursion_idx=3), case_dict
+
+    def initialize_rdr_model_name_and_load(self, func: Callable) -> None:
         model_file_name = get_func_rdr_model_name(func, include_file_name=True)
-        model_file_name = (''.join(['_' + c.lower() if c.isupper() else c for c in model_file_name]).lstrip('_')
-                           .replace('__', '_') + ".json")
-        self.rdr_model_path = os.path.join(self.rdr_models_dir, model_file_name)
+        self.model_name = str_to_snake_case(model_file_name)
         self.load()
 
-    def parse_output_type(self, func: Callable, *args) -> None:
-        for ot in make_set(self.output_type):
+    @staticmethod
+    def parse_output_type(func: Callable, output_type: Any, *args) -> List[Type]:
+        parsed_output_type = []
+        for ot in make_set(output_type):
             if ot is Self:
                 func_class = get_method_class_if_exists(func, *args)
                 if func_class is not None:
-                    self.parsed_output_type.append(func_class)
+                    parsed_output_type.append(func_class)
                 else:
                     raise ValueError(f"The function {func} is not a method of a class,"
                                      f" and the output type is {Self}.")
             else:
-                self.parsed_output_type.append(ot)
+                parsed_output_type.append(ot)
+        return parsed_output_type
 
     def save(self):
         """
         Save the RDR model to the specified directory.
         """
-        self.rdr.save(self.rdr_model_path)
-
-        if self.rdr_python_path is not None:
-            if not os.path.exists(self.rdr_python_path):
-                os.makedirs(self.rdr_python_path)
-            if not os.path.exists(os.path.join(self.rdr_python_path, "__init__.py")):
-                # add __init__.py file to the directory
-                with open(os.path.join(self.rdr_python_path, "__init__.py"), "w") as f:
-                    f.write("# This is an empty __init__.py file to make the directory a package.")
-            # write the RDR model to a python file
-            self.rdr.write_to_python_file(self.rdr_python_path)
+        self.rdr.save(self.rdr_models_dir)
 
     def load(self):
         """
         Load the RDR model from the specified directory.
         """
-        if self.rdr_model_path is not None and os.path.exists(self.rdr_model_path):
-            self.rdr = GeneralRDR.load(self.rdr_model_path)
+        if self.model_name is not None and os.path.exists(os.path.join(self.rdr_models_dir, self.model_name)):
+            self.rdr = GeneralRDR.load(self.rdr_models_dir, self.model_name)
         else:
-            self.rdr = GeneralRDR()
-
-    def write_to_python_file(self, package_dir: str, file_name_postfix: str = ""):
-        """
-        Write the RDR model to a python file.
-
-        :param package_dir: The path to the directory to write the python file.
-        """
-        self.rdr.write_to_python_file(package_dir, postfix=file_name_postfix)
+            self.rdr = GeneralRDR(save_dir=self.rdr_models_dir, model_name=self.model_name)
 
-    def update_from_python_file(self, package_dir: str):
+    def update_from_python(self):
         """
         Update the RDR model from a python file.
-
-        :param package_dir: The directory of the package that contains the generated python file.
         """
-        self.rdr.update_from_python_file(package_dir)
+        self.rdr.update_from_python(self.rdr_models_dir, self.model_name)

ripple_down_rules/rules.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
+import logging
 import re
 from abc import ABC, abstractmethod
 from uuid import uuid4
 
 from anytree import NodeMixin
-from rospy import logwarn, logdebug
 from sqlalchemy.orm import DeclarativeBase as SQLTable
 from typing_extensions import List, Optional, Self, Union, Dict, Any, Tuple
 
@@ -118,7 +118,7 @@ class Rule(NodeMixin, SubclassJSONSerializer, ABC):
             func_call = f"{parent_indent}    return {new_function_name.replace('def ', '')}(case)\n"
             return "\n".join(conclusion_lines).strip(' '), func_call
         else:
-            raise ValueError(f"Conclusion is format is not valid, it should be contain a function definition."
+            raise ValueError(f"Conclusion format is not valid, it should contain a function definition."
                              f" Instead got:\n{conclusion}\n")
 
     def write_condition_as_source_code(self, parent_indent: str = "", defs_file: Optional[str] = None) -> str:
@@ -129,9 +129,7 @@ class Rule(NodeMixin, SubclassJSONSerializer, ABC):
         :param defs_file: The file to write the conditions to if they are a definition.
         """
         if_clause = self._if_statement_source_code_clause()
-        if '\n' not in self.conditions.user_input:
-            return f"{parent_indent}{if_clause} {self.conditions.user_input}:\n"
-        elif "def " in self.conditions.user_input:
+        if "def " in self.conditions.user_input:
             if defs_file is None:
                 raise ValueError("Cannot write conditions to source code as definitions python file was not given.")
             # This means the conditions are a definition that should be written and then called
@@ -143,6 +141,9 @@ class Rule(NodeMixin, SubclassJSONSerializer, ABC):
             with open(defs_file, 'a') as f:
                 f.write(def_code.strip() + "\n\n\n")
             return f"\n{parent_indent}{if_clause} {new_function_name.replace('def ', '')}(case):\n"
+        else:
+            raise ValueError(f"Conditions format is not valid, it should contain a function definition"
+                             f" Instead got:\n{self.conditions.user_input}\n")
 
     @abstractmethod
     def _if_statement_source_code_clause(self) -> str:
@@ -164,7 +165,7 @@ class Rule(NodeMixin, SubclassJSONSerializer, ABC):
         try:
             corner_case = Case.from_json(data["corner_case"])
         except Exception as e:
-            logdebug("Failed to load corner case from json, setting it to None.")
+            logging.debug("Failed to load corner case from json, setting it to None.")
             corner_case = None
         loaded_rule = cls(conditions=CallableExpression.from_json(data["conditions"]),
                           conclusion=CallableExpression.from_json(data["conclusion"]),

ripple_down_rules/start-code-server.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+if [ -z "$RDR_EDITOR_PORT" ]; then
+    echo "RDR_EDITOR_PORT is not set. Using default port 8080."
+    RDR_EDITOR_PORT=8080
+fi
+ADDR="0.0.0.0:$RDR_EDITOR_PORT"
+# DATA_DIR="/root/.local/share/code-server"
+echo "🚀 Starting code-server on $ADDR"
+# Activate your Python virtual environment if exists else ignore
+if [ -z "$RDR_VENV_PATH" ]; then
+    echo "No virtual environment found. Skipping activation."
+else
+  source "$RDR_VENV_PATH/bin/activate"
+  # Set the default Python interpreter for VS Code
+  export DEFAULT_PYTHON_PATH=$(which python)
+fi
+
+# Start code-server.
+echo "🚀 Starting code-server on $ADDR"
+if [ -z "$CODE_SERVER_USER_DATA_DIR" ]; then
+    echo "No user data directory found. Using default"
+    code-server --bind-addr $ADDR --auth none "$@"
+else
+    echo "Using user data directory: $CODE_SERVER_USER_DATA_DIR"
+    code-server --bind-addr $ADDR --user-data-dir $CODE_SERVER_USER_DATA_DIR --auth none "$@"
+fi

ripple_down_rules/user_interface/gui.py

@@ -1,23 +1,29 @@
 from  __future__ import annotations
 
 import inspect
-from copy import copy
+import logging
 from types import MethodType
 
-from PyQt6.QtCore import Qt
-from PyQt6.QtGui import QPixmap, QPainter, QPalette
-from PyQt6.QtWidgets import (
-    QWidget, QVBoxLayout, QLabel, QScrollArea,
-    QSizePolicy, QToolButton, QHBoxLayout, QPushButton, QMainWindow, QGraphicsView, QGraphicsScene, QGraphicsPixmapItem
-)
-from qtconsole.inprocess import QtInProcessKernelManager
-from qtconsole.rich_jupyter_widget import RichJupyterWidget
+try:
+    from PyQt6.QtCore import Qt
+    from PyQt6.QtGui import QPixmap, QPainter, QPalette
+    from PyQt6.QtWidgets import (
+        QWidget, QVBoxLayout, QLabel, QScrollArea,
+        QSizePolicy, QToolButton, QHBoxLayout, QPushButton, QMainWindow, QGraphicsView, QGraphicsScene, QGraphicsPixmapItem
+    )
+    from qtconsole.inprocess import QtInProcessKernelManager
+    from qtconsole.rich_jupyter_widget import RichJupyterWidget
+except ImportError as e:
+    logging.debug("RDRCaseViewer is not available. GUI features will not work. "
+                  "Make sure you have PyQt6 installed if you want to use the GUI features.")
+    raise ImportError("PyQt6 is required for the GUI features. Please install it using 'pip install PyQt6'") from e
+
 from typing_extensions import Optional, Any, List, Dict, Callable
 
 from ..datastructures.dataclasses import CaseQuery
 from ..datastructures.enums import PromptFor
 from .template_file_creator import TemplateFileCreator
-from ..utils import is_iterable, contains_return_statement, encapsulate_user_input
+from ..utils import is_iterable, contains_return_statement, encapsulate_code_lines_into_a_function
 from .object_diagram import generate_object_graph
 
 
@@ -467,15 +473,17 @@ class RDRCaseViewer(QMainWindow):
         self.close()
 
     def _edit(self):
-        self.template_file_creator = TemplateFileCreator(self.ipython_console.kernel.shell,
-                                                         self.case_query, self.prompt_for, self.code_to_modify,
+        self.template_file_creator = TemplateFileCreator(self.case_query, self.prompt_for, self.code_to_modify,
                                                          self.print)
         self.template_file_creator.edit()
 
     def _load(self):
         if not self.template_file_creator:
             return
-        self.code_lines = self.template_file_creator.load()
+        self.code_lines, updates = self.template_file_creator.load(self.template_file_creator.temp_file_path,
+                                                                    self.template_file_creator.func_name,
+                                                                    self.template_file_creator.print_func)
+        self.ipython_console.kernel.shell.user_ns.update(updates)
         if self.code_lines is not None:
             self.user_input = encapsulate_code_lines_into_a_function(
                 self.code_lines, self.template_file_creator.func_name,
@@ -558,28 +566,6 @@ class RDRCaseViewer(QMainWindow):
         layout.addWidget(item_label)
 
 
-def encapsulate_code_lines_into_a_function(code_lines: List[str], function_name: str, function_signature: str,
-                                           func_doc: str, case_query: CaseQuery) -> str:
-    """
-    Encapsulate the given code lines into a function with the specified name, signature, and docstring.
-
-    :param code_lines: The lines of code to include in the user input.
-    :param function_name: The name of the function to include in the user input.
-    :param function_signature: The function signature to include in the user input.
-    :param func_doc: The function docstring to include in the user input.
-    :param case_query: The case query object.
-    """
-    code = '\n'.join(code_lines)
-    code = encapsulate_user_input(code, function_signature, func_doc)
-    if case_query.is_function:
-        args = "**case"
-    else:
-        args = "case"
-    if f"return {function_name}({args})" not in code:
-        code = code.strip() + f"\nreturn {function_name}({args})"
-    return code
-
-
 class IPythonConsole(RichJupyterWidget):
     def __init__(self, namespace=None, parent=None):
         super(IPythonConsole, self).__init__(parent)

ripple_down_rules/user_interface/ipython_custom_shell.py

@@ -8,9 +8,8 @@ from traitlets.config import Config
 
 from ..datastructures.dataclasses import CaseQuery
 from ..datastructures.enums import PromptFor
-from .gui import encapsulate_code_lines_into_a_function
 from .template_file_creator import TemplateFileCreator
-from ..utils import contains_return_statement, extract_dependencies
+from ..utils import contains_return_statement, extract_dependencies, encapsulate_code_lines_into_a_function
 
 
 @magics_class
@@ -21,7 +20,7 @@ class MyMagics(Magics):
                  prompt_for: Optional[PromptFor] = None,
                  case_query: Optional[CaseQuery] = None):
         super().__init__(shell)
-        self.rule_editor = TemplateFileCreator(shell, case_query, prompt_for=prompt_for, code_to_modify=code_to_modify)
+        self.rule_editor = TemplateFileCreator(case_query, prompt_for=prompt_for, code_to_modify=code_to_modify)
         self.all_code_lines: Optional[List[str]] = None
 
     @line_magic
@@ -30,7 +29,10 @@ class MyMagics(Magics):
 
     @line_magic
     def load(self, line):
-        self.all_code_lines = self.rule_editor.load()
+        self.all_code_lines, updates = self.rule_editor.load(self.rule_editor.temp_file_path,
+                                                             self.rule_editor.func_name,
+                                                             self.rule_editor.print_func)
+        self.shell.user_ns.update(updates)
 
     @line_magic
     def help(self, line):

ripple_down_rules/user_interface/object_diagram.py

@@ -1,4 +1,10 @@
-import graphviz
+import logging
+
+try:
+    import graphviz
+except ImportError:
+    graphviz = None
+    logging.debug("Graphviz is not installed")
 
 
 def is_simple(obj):

ripple_down_rules/user_interface/prompt.py

@@ -2,7 +2,13 @@ import ast
 import logging
 from _ast import AST
 
-from PyQt6.QtWidgets import QApplication
+try:
+    from PyQt6.QtWidgets import QApplication
+    from .gui import RDRCaseViewer
+except ImportError:
+    QApplication = None
+    RDRCaseViewer = None
+
 from colorama import Fore, Style
 from pygments import highlight
 from pygments.formatters.terminal import TerminalFormatter
@@ -11,8 +17,7 @@ from typing_extensions import Optional, Tuple
 
 from ..datastructures.callable_expression import CallableExpression, parse_string_to_expression
 from ..datastructures.dataclasses import CaseQuery
-from ..datastructures.enums import PromptFor, InteractionMode
-from .gui import RDRCaseViewer
+from ..datastructures.enums import PromptFor
 from .ipython_custom_shell import IPythonShell
 from ..utils import make_list
 
@@ -90,7 +95,7 @@ class UserPrompt:
                 prompt_str = f"Give conditions on when can the rule be evaluated for:"
         case_query.scope.update({'case': case_query.case})
         shell = None
-        if QApplication.instance() is None:
+        if self.viewer is None:
             prompt_str = self.construct_prompt_str_for_shell(case_query, prompt_for, prompt_str)
             shell = IPythonShell(header=prompt_str, prompt_for=prompt_for, case_query=case_query,
                                  code_to_modify=code_to_modify)

ripple_down_rules/user_interface/template_file_creator.py

@@ -8,14 +8,13 @@ from functools import cached_property
 from textwrap import indent, dedent
 
 from colorama import Fore, Style
-from ipykernel.inprocess.ipkernel import InProcessInteractiveShell
-from typing_extensions import Optional, Type, List, Callable
+from typing_extensions import Optional, Type, List, Callable, Tuple, Dict
 
 from ..datastructures.case import Case
 from ..datastructures.dataclasses import CaseQuery
 from ..datastructures.enums import Editor, PromptFor
 from ..utils import str_to_snake_case, get_imports_from_scope, make_list, typing_hint_to_str, \
-    get_imports_from_types, extract_function_source
+    get_imports_from_types, extract_function_source, extract_imports
 
 
 def detect_available_editor() -> Optional[Editor]:
@@ -49,6 +48,9 @@ def start_code_server(workspace):
                             stderr=subprocess.PIPE, text=True)
 
 
+FunctionData = Tuple[Optional[List[str]], Optional[Dict[str, Callable]]]
+
+
 class TemplateFileCreator:
     """
     A class to create a rule template file for a given case and prompt for the user to edit it.
@@ -70,10 +72,9 @@ class TemplateFileCreator:
     The list of all code lines in the function in the temporary file.
     """
 
-    def __init__(self, shell: InProcessInteractiveShell, case_query: CaseQuery, prompt_for: PromptFor,
-                 code_to_modify: Optional[str] = None, print_func: Optional[Callable[[str], None]] = None):
-        self.print_func = print_func if print_func else print
-        self.shell = shell
+    def __init__(self, case_query: CaseQuery, prompt_for: PromptFor,
+                 code_to_modify: Optional[str] = None, print_func: Callable[[str], None] = print):
+        self.print_func = print_func
         self.code_to_modify = code_to_modify
         self.prompt_for = prompt_for
         self.case_query = case_query
@@ -228,15 +229,27 @@ class TemplateFileCreator:
         imports = set(imports)
         return '\n'.join(imports)
 
+    @staticmethod
+    def get_core_attribute_types(case_query: CaseQuery) -> List[Type]:
+        """
+        Get the core attribute types of the case query.
+
+        :return: A list of core attribute types.
+        """
+        attr_types = [t for t in case_query.core_attribute_type if t.__module__ != "builtins" and t is not None
+                      and t is not type(None)]
+        return attr_types
+
     def get_func_doc(self) -> Optional[str]:
         """
         :return: A string containing the function docstring.
         """
+        type_data = f" of type {' or '.join(map(lambda c: c.__name__, self.get_core_attribute_types(self.case_query)))}"
         if self.prompt_for == PromptFor.Conditions:
             return (f"Get conditions on whether it's possible to conclude a value"
-                    f" for {self.case_query.name}")
+                    f" for {self.case_query.name} {type_data}.")
         else:
-            return f"Get possible value(s) for {self.case_query.name}"
+            return f"Get possible value(s) for {self.case_query.name} {type_data}."
 
     @staticmethod
     def get_func_name(prompt_for, case_query) -> Optional[str]:
@@ -245,12 +258,12 @@ class TemplateFileCreator:
             func_name = f"{prompt_for.value.lower()}_for_"
         case_name = case_query.name.replace(".", "_")
         if case_query.is_function:
-            # convert any CamelCase word into snake_case by adding _ before each capital letter
-            case_name = case_name.replace(f"_{case_query.attribute_name}", "")
-        func_name += case_name
-        attr_types = [t for t in case_query.core_attribute_type if t.__module__ != "builtins" and t is not None
-                      and t is not type(None)]
-        func_name += f"_of_type_{'_or_'.join(map(lambda c: c.__name__, attr_types))}"
+            func_name += case_name.replace(f"_{case_query.attribute_name}", "")
+        else:
+            func_name += case_name
+            attribute_types = TemplateFileCreator.get_core_attribute_types(case_query)
+            attribute_type_names = [t.__name__ for t in attribute_types]
+            func_name += f"_of_type_{'_or_'.join(attribute_type_names)}"
         return str_to_snake_case(func_name)
 
     @cached_property
@@ -263,33 +276,43 @@ class TemplateFileCreator:
         case = self.case_query.scope['case']
         return case._obj_type if isinstance(case, Case) else type(case)
 
-    def load(self) -> Optional[List[str]]:
-        if not self.temp_file_path:
-            self.print_func(f"{Fore.RED}ERROR:: No file to load. Run %edit first.{Style.RESET_ALL}")
-            return None
+    @staticmethod
+    def load(file_path: str, func_name: str, print_func: Callable = print) -> FunctionData:
+        """
+        Load the function from the given file path.
+
+        :param file_path: The path to the file to load.
+        :param func_name: The name of the function to load.
+        :param print_func: The function to use for printing messages.
+        :return: A tuple containing the function source code and the function object as a dictionary
+        with the function name as the key and the function object as the value.
+        """
+        if not file_path:
+            print_func(f"{Fore.RED}ERROR:: No file to load. Run %edit first.{Style.RESET_ALL}")
+            return None, None
 
-        with open(self.temp_file_path, 'r') as f:
+        with open(file_path, 'r') as f:
             source = f.read()
 
         tree = ast.parse(source)
         updates = {}
         for node in tree.body:
-            if isinstance(node, ast.FunctionDef) and node.name == self.func_name:
+            if isinstance(node, ast.FunctionDef) and node.name == func_name:
                 exec_globals = {}
-                exec(source, self.case_query.scope, exec_globals)
-                user_function = exec_globals[self.func_name]
-                updates[self.func_name] = user_function
-                self.print_func(f"{Fore.BLUE}Loaded `{self.func_name}` function into user namespace.{Style.RESET_ALL}")
+                scope = extract_imports(tree=tree)
+                exec(source, scope, exec_globals)
+                user_function = exec_globals[func_name]
+                updates[func_name] = user_function
+                print_func(f"{Fore.BLUE}Loaded `{func_name}` function into user namespace.{Style.RESET_ALL}")
                 break
         if updates:
-            self.shell.user_ns.update(updates)
-            self.all_code_lines = extract_function_source(self.temp_file_path,
-                                                          [self.func_name],
-                                                          join_lines=False)[self.func_name]
-            return self.all_code_lines
+            all_code_lines = extract_function_source(file_path,
+                                                          [func_name],
+                                                          join_lines=False)[func_name]
+            return all_code_lines, updates
         else:
-            self.print_func(f"{Fore.RED}ERROR:: Function `{self.func_name}` not found.{Style.RESET_ALL}")
-            return None
+            print_func(f"{Fore.RED}ERROR:: Function `{func_name}` not found.{Style.RESET_ALL}")
+            return None, None
 
     def __del__(self):
         if hasattr(self, 'process') and self.process is not None and self.process.poll() is None: