Latest changes

Author: JaumeAmoresDS

nbmodular/cell2func.py

@@ -1260,8 +1260,9 @@ def __init__(
         test_write=False,
         pipe_name=None,
         restrict_inputs=False,
-        api=True,
-        keep_original_in_documentation=False,
+        include_magic=False,
+        include_in_code=True,
+        include_in_docs=True,
         **kwargs,
     ):
         """
@@ -1406,8 +1407,11 @@ def __init__(
         self.code_cells_path = Path(code_cells_path)
         self.code_cells_path.mkdir(parents=True, exist_ok=True)
 
-        self.api = api  # do we need this?
-        self.keep_original_in_documentation = keep_original_in_documentation
+        # do we need this?
+        self.include_magic = include_magic
+        self.include_in_code = include_in_code
+        self.include_in_docs = include_in_docs
+
         self.restrict_inputs = restrict_inputs
         self.current_function = Bunch()
 
@@ -1546,10 +1550,9 @@ def __init__(
         self.export_always = export_always
 
         self.default_restrict_inputs = self.restrict_inputs
-        self.default_api = self.api
-        self.default_keep_original_in_documentation = (
-            self.keep_original_in_documentation
-        )
+        self.default_include_magic = include_magic
+        self.default_include_in_code = include_in_code
+        self.default_include_in_docs = include_in_docs
 
         self.parser = argparse.ArgumentParser(
             description="Arguments to `function` magic cell."

nbmodular/export.py

@@ -280,14 +280,21 @@ def __init__(
         log_level="INFO",
         from_notebook=False,
         restrict_inputs=False,
-        api=True,
+        include_magic=False,
+        include_in_code=True,
+        include_in_docs=True,
     ):
         nb = read_nb(path) if nb is None else nb
         super().__init__(nb)
         self.logger = create_or_get_logger(logger_name, log_level)
         self.logger.info(f"Analyzing code from notebook {path}")
         self.cell_processor = CellProcessor(
-            path=path, run=from_notebook, restrict_inputs=restrict_inputs, api=api
+            path=path,
+            run=from_notebook,
+            restrict_inputs=restrict_inputs,
+            include_magic=include_magic,
+            include_in_code=include_in_code,
+            include_in_docs=include_in_docs,
         )
         self.cell_processor.change_file_name = False
         self.cell_processor.set_run_tests(False)