Updated code with the established formulallm package.

Src/Kernel/FormulaPy/README.md

@@ -6,15 +6,11 @@ python >= 3.10
 dotnet 6.0
 ```
 
-### With .NET on x64 or Apple Silicon ARM64
+### Install and Set Env
 ```bash
-$ cd Src/CommandLine
-$ dotnet build CommandLine.sln /p:Configuration=Release /p:Platform=x64|ARM64
-```
+dotnet tool install --global VUISIS.Formula.<x64|ARM64> 
 
-### Copy CommandLine build files into the CommandLine folder.
-```bash
-$ cp -r Src/CommandLine/bin/Release/<OS>/<PLATFORM>/net6.0/* Src/Kernel/FormulaPy/CommandLine
+Set the environment variable OPENAI_API_KEY before running.
 ```
 
 ### Install FormulaPy kernel
@@ -27,13 +23,4 @@ $ pip install .
 ```bash
 $ sudo ln -s /usr/lib/dotnet/host/fxr/<version>/libhostfxr.so /usr/lib/dotnet
 $ conda install -c conda-forge libstdcxx-ng=12
-```
-
-### Add to config.py with OpenAI API key in SelfRepairLLM/src
-```bash
-$ cfg = {
-	"OPENAI_API_KEY" : "",
-	"ACTIVELOOP_TOKEN" : "(OPTIONAL)",
-	"LANGCHAIN_API_KEY" : "(OPTIONAL)"
-}
 ```

Src/Kernel/FormulaPy/formula/__init__.py

@@ -1,11 +1,5 @@
 __version__ = '0.0.1'
 
-from pythonnet import load
-load("coreclr")
-import clr
-d = __file__.replace("__init__.py","")
-clr.AddReference(d + "CommandLine/VUISIS.Formula.x64.dll")
-
 from .formula_magic import FormulaMagics
 
 def load_ipython_extension(ipython):

Src/Kernel/FormulaPy/formula/formula_magic.py

@@ -1,32 +1,18 @@
 from __future__ import print_function
-from pickle import TRUE
 from IPython.core.magic import (Magics, magics_class, line_magic)
 from IPython.core.magic_arguments import (argument, magic_arguments, parse_argstring)
 
 import re, os
 
-from Microsoft.Formula.CommandLine import CommandInterface, CommandLineProgram
-from System.IO import StringWriter
-from System import Console
-
-from .formula_agent import run_agent_executor, run_agent_executor_repair
+from formulallm.formula_agent import run_agent_executor, run_agent_executor_repair
+from formulallm.formula_program import FormulaInterface
 
 @magics_class
 class FormulaMagics(Magics):
 
     def __init__(self, shell, data=None):
         super(FormulaMagics, self).__init__(shell)
-        self.sw = StringWriter()
-        self.total_sw_output = "END"
-        Console.SetOut(self.sw)
-        Console.SetError(self.sw)
-        self.file_txt = None
-
-        sink = CommandLineProgram.ConsoleSink()
-        chooser = CommandLineProgram.ConsoleChooser()
-        self.ci = CommandInterface(sink, chooser)
-        self.ci.DoCommand("wait on")
-        self.sw.GetStringBuilder().Clear()
+        self.fi = FormulaInterface()
         print("Successfully initialized formula.")
 
     @line_magic
@@ -68,14 +54,11 @@ def run_command(self, cmd, args=None):
             line = cmd
         else:
             line = cmd + " " + args
-
-        self.ci.DoCommand(line)
-
-        temp_str = self.sw.ToString()
+
+        temp_str = self.fi.run_command(line)
         if cmd == "extract":
             self.total_sw_output = temp_str
 
-        self.sw.GetStringBuilder().Clear()
         print(temp_str)
 
     @line_magic

Src/Kernel/FormulaPy/setup.py

@@ -7,6 +7,5 @@
    author='VUISIS',
    author_email='[email protected]',
    packages=['formula'],
-   install_requires=['pythonnet','jupyter','langchain==0.0.239', "openai"],
-   package_data={'formula': ['CommandLine/*']}
+   install_requires=['jupyter','formulallm']
 )