fix: all in one

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "llm_docker_setting_pub"]
 	path = llm_docker_setting_pub
 	url = https://github.com/nobu007/llm_docker_setting_pub.git
+[submodule "GuiAgentLoopCore"]
+	path = GuiAgentLoopCore
+	url = https://github.com/nobu007/GuiAgentLoopCore.git

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+repos:
+  # Using this mirror lets us use mypyc-compiled black, which is 2x faster
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.10.1
+    hooks:
+      - id: black
+        # It is recommended to specify the latest version of Python
+        # supported by your project here, or alternatively use
+        # pre-commit's default_language_version, see
+        # https://pre-commit.com/#top_level-default_language_version
+        language_version: python3.11
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort

envsetup.sh

@@ -1,27 +1,2 @@
 # AUTO DEV SETUP
 
-# check if rye is installed
-if ! command -v rye &>/dev/null; then
-    echo "rye could not be found: installing now ..."
-    curl -sSf https://rye-up.com/get | RYE_INSTALL_OPTION="--yes" bash
-    echo "Check the rye docs for more info: https://rye-up.com/"
-fi
-
-export PATH="$HOME/.rye/shims:$PATH"
-
-cd /app
-source "$HOME/.rye/env"
-echo 'source "$HOME/.rye/env"' >> ~/.bashrc
-echo 'source "$HOME/.rye/env"' >> ~/.profile
-
-
-echo "SYNC: setup .venv"
-rye sync
-
-rye add pytest pre-commit
-
-echo "ACTIVATE: activate .venv"
-source .venv/bin/activate
-
-echo "SETUP: install pre-commit hooks"
-pre-commit install

examples/anthropic_claude.py

@@ -1,7 +1,5 @@
 from codeinterpreterapi import CodeInterpreterSession
 
-with CodeInterpreterSession(model="claude-2") as session:
-    result = session.generate_response(
-        "Plot the nvidea stock vs microsoft stock over the last 6 months."
-    )
+with CodeInterpreterSession(model="claude-3-haiku-20240307") as session:
+    result = session.generate_response("Plot the nvidea stock vs microsoft stock over the last 6 months.")
     result.show()

examples/chat_cli.py

@@ -2,12 +2,7 @@
 
 settings.MODEL = "gpt-4"
 
-print(
-    "AI: Hello, I am the "
-    "code interpreter agent.\n"
-    "Ask me todo something and "
-    "I will use python to do it!\n"
-)
+print("AI: Hello, I am the " "code interpreter agent.\n" "Ask me todo something and " "I will use python to do it!\n")
 
 with CodeInterpreterSession() as session:
     while True:

examples/chat_history_backend.py

@@ -6,11 +6,14 @@
 from codeinterpreterapi import CodeInterpreterSession  # noqa: E402
 
 
-def main() -> None:
+def main(is_local=True) -> None:
     session_id = None
 
     session = CodeInterpreterSession()
-    session.start()
+    if is_local:
+        session.start_local()
+    else:
+        session.start()
 
     print("Session ID:", session.session_id)
     session_id = session.session_id

examples/frontend/app.py

@@ -2,8 +2,9 @@
 import sys
 
 import streamlit as st
+
 from codeinterpreterapi import File
-from utils import get_images  # type: ignore
+from codeinterpreterapi.config import settings
 
 # Page configuration
 st.set_page_config(layout="wide")

examples/frontend/chainlitui.py

@@ -1,4 +1,5 @@
 import chainlit as cl  # type: ignore
+
 from codeinterpreterapi import CodeInterpreterSession
 from codeinterpreterapi import File as CIFile
 
@@ -11,37 +12,32 @@ async def on_action(action: cl.Action) -> None:
 
     # Wait for the user to upload a file
     while files is None:
-        files = await cl.AskFileMessage(
-            content="Please upload a text file to begin!", accept=["text/csv"]
-        ).send()
+        files = await cl.AskFileMessage(content="Please upload a text file to begin!", accept=["text/csv"]).send()
     # Decode the file
     text_file = files[0]
     text = text_file.content.decode("utf-8")
 
     UPLOADED_FILES.append(text_file)
 
     # Let the user know that the system is ready
-    await cl.Message(
-        content=f"`{text_file.name}` uploaded, it contains {len(text)} characters!"
-    ).send()
+    await cl.Message(content=f"`{text_file.name}` uploaded, it contains {len(text)} characters!").send()
     await action.remove()
 
 
 @cl.on_chat_start
 async def start_chat() -> None:
-    actions = [
-        cl.Action(name="upload_file", value="example_value", description="Upload file")
-    ]
+    actions = [cl.Action(name="upload_file", value="example_value", description="Upload file")]
 
-    await cl.Message(
-        content="Hello, How can I assist you today", actions=actions
-    ).send()
+    await cl.Message(content="Hello, How can I assist you today", actions=actions).send()
 
 
 @cl.on_message
-async def run_conversation(user_message: str) -> None:
+async def run_conversation(user_message: str, is_local=True) -> None:
     session = CodeInterpreterSession()
-    await session.astart()
+    if is_local:
+        await session.astart_local()
+    else:
+        await session.astart()
 
     files = [CIFile(name=it.name, content=it.content) for it in UPLOADED_FILES]
 
@@ -54,9 +50,7 @@ async def run_conversation(user_message: str) -> None:
         )
         for file in response.files
     ]
-    actions = [
-        cl.Action(name="upload_file", value="example_value", description="Upload file")
-    ]
+    actions = [cl.Action(name="upload_file", value="example_value", description="Upload file")]
     await cl.Message(
         content=response.content,
         elements=elements,

examples/frontend/utils.py

@@ -4,6 +4,7 @@
 from typing import Optional
 
 import streamlit as st
+
 from codeinterpreterapi import CodeInterpreterSession
 
 
@@ -21,7 +22,7 @@ async def get_images(prompt: str, files: Optional[list] = None) -> list:
     with st.chat_message("user"):  # type: ignore
         st.write(prompt)
     with st.spinner():
-        async with CodeInterpreterSession(model="gpt-3.5-turbo") as session:
+        async with CodeInterpreterSession(model="claude-3-haiku-20240307") as session:
             response = await session.agenerate_response(prompt, files=files)
 
             with st.chat_message("assistant"):  # type: ignore

examples/plot_sin_wave.py

@@ -3,9 +3,7 @@
 
 async def main() -> None:
     async with CodeInterpreterSession() as session:
-        response = await session.agenerate_response(
-            "Plot a sin wave and show it to me."
-        )
+        response = await session.agenerate_response("Plot a sin wave and show it to me.")
         response.show()
 
 

examples/show_bitcoin_chart.py

@@ -7,9 +7,7 @@ def main() -> None:
     with CodeInterpreterSession(local=True) as session:
         currentdate = datetime.now().strftime("%Y-%m-%d")
 
-        response = session.generate_response(
-            f"Plot the bitcoin chart of 2023 YTD (today is {currentdate})"
-        )
+        response = session.generate_response(f"Plot the bitcoin chart of 2023 YTD (today is {currentdate})")
 
         # prints the text and shows the image
         response.show()

examples/use_additional_tools.py

@@ -4,13 +4,15 @@
 so it can download the bitcoin chart from yahoo finance
 and plot it for you
 """
+
 import csv
 import io
 from typing import Any
 
-from codeinterpreterapi import CodeInterpreterSession
 from langchain_core.tools import BaseTool
 
+from codeinterpreterapi import CodeInterpreterSession
+
 
 class ExampleKnowledgeBaseTool(BaseTool):
     name: str = "salary_database"
@@ -31,12 +33,8 @@ async def _arun(self, *args: Any, **kwargs: Any) -> Any:
 
 
 async def main() -> None:
-    async with CodeInterpreterSession(
-        additional_tools=[ExampleKnowledgeBaseTool()]
-    ) as session:
-        response = await session.agenerate_response(
-            "Plot chart of company employee salaries"
-        )
+    async with CodeInterpreterSession(additional_tools=[ExampleKnowledgeBaseTool()]) as session:
+        response = await session.agenerate_response("Plot chart of company employee salaries")
 
         response.show()
 

healthcheck.sh

@@ -6,14 +6,15 @@ LOG_FILE="/app/work/all.log"
 log() {
     echo "$(date '+%Y-%m-%d %H:%M:%S') $1" | tee -a "$LOG_FILE"
 }
-APP_START_PY="/app/examples/frontend/app.py"
+APP_START_PY="/app/server.py"
 
 # /app/server.pyが起動しているかチェック
 if ! pgrep -f "python ${APP_START_PY}" >/dev/null; then
     log "${APP_START_PY} is not running. Starting it now..."
     # open_interpreterを起動
-    if bash -c "eval $(pyenv init -) && python ${APP_START_PY} >> $LOG_FILE  2>&1" & then
+    if bash -c "eval $(pyenv init -) && python ${APP_START_PY} 2>&1" & then
         log "${APP_START_PY} started successfully."
+        sleep 3600
         exit 0
     else
         log "Failed to start ${APP_START_PY}."

install.sh

@@ -1,9 +1,5 @@
 # AUTO DEV INSTALL
 
-export PATH="$HOME/.rye/shims:$PATH"
-
-cd /app
-echo "ACTIVATE: activate .venv"
-source .venv/bin/activate
-
+pwd
+eval "$(pyenv init -)"
 pip install -e .

install_0.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+eval "$(pyenv init -)"
+pip install -r requirements.txt

install_10.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# This is for GuiAgentLoopCore
+
+eval "$(pyenv init -)"
+cd GuiAgentLoopCore
+pip install -e .