Code update

Signed-off-by: refai06 <refai.ahamed06@gmail.com>

Author: refai06

openfl/experimental/workflow/component/director/director.py

@@ -105,7 +105,7 @@ async def start_experiment_execution_loop(self) -> None:
                             private_key=self.private_key,
                             tls=self.tls,
                             director_config=self.director_config,
-                            install_requirements=False,
+                            install_requirements=self.install_requirements,
                         )
                     )
                     # Adding the experiment to collaborators queues

openfl/experimental/workflow/component/director/experiment.py

@@ -88,7 +88,7 @@ async def start(
         private_key: Optional[Union[Path, str]] = None,
         certificate: Optional[Union[Path, str]] = None,
         director_config: Path = None,
-        install_requirements: bool = False,
+        install_requirements: bool = True,
     ) -> Tuple[bool, Any]:
         """Run experiment.
 
@@ -103,7 +103,7 @@ async def start(
                 certificate for TLS. Defaults to None.
             director_config (Path): Path to director's config file
             install_requirements (bool, optional): A flag indicating if the
-                requirements should be installed. Defaults to False.
+                requirements should be installed. Defaults to True.
 
         Returns:
             List[Union[bool, Any]]:

openfl/experimental/workflow/interface/cli/director.py

@@ -97,7 +97,7 @@ def start(director_config_path, tls, root_certificate, private_key, certificate)
         validators=[
             Validator("settings.listen_host", default="localhost"),
             Validator("settings.listen_port", default=50051, gte=1024, lte=65535),
-            Validator("settings.install_requirements", default=False),
+            Validator("settings.install_requirements", default=True),
             Validator(
                 "settings.envoy_health_check_period",
                 default=60,  # in seconds

openfl/experimental/workflow/notebooktools/code_analyzer.py

@@ -7,7 +7,7 @@
 import sys
 from importlib import import_module
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional
 
 import nbformat
 from nbdev.export import nb_export
@@ -18,8 +18,9 @@ class CodeAnalyzer:
       Provides code extraction and transformation functionality
 
     Attributes:
-        script_path (Path): Absolute path to the python script generated.
         script_name (str): Name of the generated python script.
+        script_path (Path): Absolute path to the python script generated.
+        requirements (List[str]): List of pip libraries found in the script.
         exported_script_module (ModuleType): The imported module object of the generated script.
         available_modules_in_exported_script (list): List of available attributes in the
             exported script.
@@ -43,6 +44,7 @@ def __init__(self, notebook_path: Path, output_path: Path) -> None:
                 f"{self.script_name}.py",
             )
         ).resolve()
+        self.requirements = self._get_requirements()
         self.__modify_experiment_script()
 
     def __get_exp_name(self, notebook_path: Path) -> str:
@@ -292,41 +294,25 @@ def _clean_value(self, value: str) -> str:
             value = value.lstrip("[").rstrip("]")
         return value
 
-    def get_requirements(self) -> Tuple[List[str], List[int], List[str]]:
+    def _get_requirements(self) -> List[str]:
         """Extract pip libraries from the script
 
         Returns:
-            tuple: A tuple containing:
-                requirements (list of str): List of pip libraries found in the script.
-                line_nos (list of int): List of line numbers where "pip install" commands are found.
-                data (list of str): The entire script data as a list of lines.
+            requirements (List[str]): List of pip libraries found in the script.
         """
         data = None
         with self.script_path.open("r") as f:
             requirements = []
-            line_nos = []
             data = f.readlines()
-            for i, line in enumerate(data):
+            for _, line in enumerate(data):
                 line = line.strip()
                 if "pip install" in line:
-                    line_nos.append(i)
                     # Avoid commented lines, libraries from *.txt file, or openfl.git
                     # installation
                     if not line.startswith("#") and "-r" not in line and "openfl.git" not in line:
                         requirements.append(f"{line.split(' ')[-1].strip()}\n")
 
-            return requirements, line_nos, data
-
-    def remove_lines(self, data: List[str], line_nos: List[int]) -> None:
-        """Removes pip install lines from the script
-        Args:
-            data (List[str]): The entire script data as a list of lines.
-            line_nos (List[int]): List of line numbers where "pip install" commands are found.
-        """
-        with self.script_path.open("w") as f:
-            for i, line in enumerate(data):
-                if i not in line_nos:
-                    f.write(line)
+            return requirements
 
     def get_flow_class_details(self, parent_class) -> Dict[str, Any]:
         """

openfl/experimental/workflow/notebooktools/notebook_tools.py

@@ -76,13 +76,11 @@ def _generate_requirements(self) -> None:
         and append to workspace/requirements.txt
         """
         try:
-            requirements, requirements_line_numbers, data = self.code_analyzer.get_requirements()
             requirements_filepath = str(
                 self.output_workspace_path.joinpath("requirements.txt").resolve()
             )
             with open(requirements_filepath, "a") as f:
-                f.writelines(requirements)
-            self.code_analyzer.remove_lines(data, requirements_line_numbers)
+                f.writelines(self.code_analyzer.requirements)
 
             print(f"Successfully generated {requirements_filepath}")