Merge branch 'dev'

Conflicts:
	codeinterpreterapi/session.py
	pyproject.toml

Author: shroominic

.env.example

@@ -1,3 +1,6 @@
-OPENAI_API_KEY= # your openai api key (required)
-CODEBOX_API_KEY= # your codebox api key (optional, required for production)
-VERBOSE=False # set to True to enable verbose logging
+# (required)
+OPENAI_API_KEY=
+# (optional, required for production)
+# CODEBOX_API_KEY=
+# (set True to enable logging)
+VERBOSE=False 

README.md

@@ -19,9 +19,12 @@ You can run everything local except the LLM using your own OpenAI API Key.
 Get your OpenAI API Key [here](https://platform.openai.com/account/api-keys) and install the package.
 
 ```bash
-pip install codeinterpreterapi
+pip install "codeinterpreterapi[all]"
 ```
 
+Everything for local experiments are installed with the `all` extra.
+For deployments, you can use `pip install codeinterpreterapi` instead which does not install the additional dependencies.
+
 ## Usage
 
 Make sure to set the `OPENAI_API_KEY` environment variable (or use a `.env` file)

codeinterpreterapi/__init__.py

@@ -1,2 +1,2 @@
 from codeinterpreterapi.session import CodeInterpreterSession
-from codeinterpreterapi.schema import File
+from codeinterpreterapi.schema import File

codeinterpreterapi/agents/__init__.py

@@ -0,0 +1 @@
+from .functions_agent import OpenAIFunctionsAgent

codeinterpreterapi/agents/custom_agent.py

@@ -0,0 +1,2 @@
+# TODO: override some methods of the ConversationalAgent class 
+# to improve the agent's performance

codeinterpreterapi/chains/functions_agent.py renamed to codeinterpreterapi/agents/functions_agent.py

@@ -0,0 +1,3 @@
+from .modifications_check import get_file_modifications
+from .rm_dl_link import remove_download_link
+from .extract_code import extract_python_code

codeinterpreterapi/chains/__init__.py

@@ -0,0 +1,45 @@
+import json
+from typing import List, Optional
+
+from langchain.base_language import BaseLanguageModel
+from langchain.chat_models.openai import ChatOpenAI
+from langchain.chat_models.anthropic import ChatAnthropic
+from langchain.schema import AIMessage, OutputParserException
+
+# from codeinterpreterapi.prompts import extract_code_prompt
+
+
+async def extract_python_code(
+    text: str,
+    llm: BaseLanguageModel,
+    retry: int = 2,
+) -> Optional[str]:
+    pass
+    
+
+async def test():
+    llm = ChatAnthropic(model="claude-1.3")  # type: ignore
+    
+    code = \
+        """
+        import matplotlib.pyplot as plt
+
+        x = list(range(1, 11))
+        y = [29, 39, 23, 32, 4, 43, 43, 23, 43, 77]
+
+        plt.plot(x, y, marker='o')
+        plt.xlabel('Index')
+        plt.ylabel('Value')
+        plt.title('Data Plot')
+
+        plt.show()
+        """
+    
+    print(await extract_python_code(code, llm))
+    
+
+if __name__ == "__main__":
+    import asyncio, dotenv
+    dotenv.load_dotenv()
+
+    asyncio.run(test())

codeinterpreterapi/chains/extract_code.py

@@ -3,9 +3,10 @@
 
 from langchain.base_language import BaseLanguageModel
 from langchain.chat_models.openai import ChatOpenAI
+from langchain.chat_models.anthropic import ChatAnthropic
 from langchain.schema import AIMessage, OutputParserException
 
-from codeinterpreterapi.prompts import determine_modifications_function, determine_modifications_prompt
+from codeinterpreterapi.prompts import determine_modifications_prompt
 
 
 async def get_file_modifications(
@@ -15,44 +16,44 @@ async def get_file_modifications(
 ) -> Optional[List[str]]:
     if retry < 1:
         return None
-    messages = determine_modifications_prompt.format_prompt(code=code).to_messages()
-    message = await llm.apredict_messages(messages, functions=[determine_modifications_function])
 
-    if not isinstance(message, AIMessage):
-        raise OutputParserException("Expected an AIMessage")
+    prompt = determine_modifications_prompt.format(code=code)
 
-    function_call = message.additional_kwargs.get("function_call", None)
+    result = await llm.apredict(prompt, stop="```")
 
-    if function_call is None:
+    
+    try:
+        result = json.loads(result)
+    except json.JSONDecodeError:
+        result = ""
+    if not result or not isinstance(result, dict) or "modifications" not in result:
         return await get_file_modifications(code, llm, retry=retry - 1)
-    else:
-        function_call = json.loads(function_call["arguments"])
-        return function_call["modifications"]
-
+    return result["modifications"]
+    
 
 async def test():
-    llm = ChatOpenAI(model="gpt-3.5")  # type: ignore
-
-    code = """
-    import matplotlib.pyplot as plt
-
-    x = list(range(1, 11))
-    y = [29, 39, 23, 32, 4, 43, 43, 23, 43, 77]
-
-    plt.plot(x, y, marker='o')
-    plt.xlabel('Index')
-    plt.ylabel('Value')
-    plt.title('Data Plot')
-
-    plt.show()
-    """
-
+    llm = ChatAnthropic(model="claude-1.3")  # type: ignore
+    
+    code = \
+        """
+        import matplotlib.pyplot as plt
+
+        x = list(range(1, 11))
+        y = [29, 39, 23, 32, 4, 43, 43, 23, 43, 77]
+
+        plt.plot(x, y, marker='o')
+        plt.xlabel('Index')
+        plt.ylabel('Value')
+        plt.title('Data Plot')
+
+        plt.show()
+        """
+    
     print(await get_file_modifications(code, llm))
-
+    
 
 if __name__ == "__main__":
-    import asyncio
-    from dotenv import load_dotenv
-    load_dotenv()
+    import asyncio, dotenv
+    dotenv.load_dotenv()
 
     asyncio.run(test())