Update app.py

app.py

@@ -1,20 +1,24 @@
-import re, subprocess, openai, random, os, requests
+import re, os, subprocess, openai, random, regex, shutil
 import pandas as pd
 import numpy as np
 import streamlit as st
 from streamlit_chat import message
 
 # some helper vars and functions
+thispath = os.path.realpath(os.path.dirname(__file__)
 if 'displayChat' not in st.session_state:
     with st.spinner('Setting up plugins...'):
         os.system('mkdir files')
         os.system('mkdir plugins')
         googleS = requests.get('https://raw.githubusercontent.com/d3n7/GPT-4-Unlimited-Tools/main/plugins/google.py').content
-        googlePath = os.path.join(os.path.realpath(os.path.dirname(__file__)), 'plugins', 'google.py')
+        googlePath = os.path.join(thispath), 'plugins', 'google.py')
         with open(googlePath, 'wb') as f:
             f.write(googleS)
-    
-    st.session_state['displayChat'] = False
+        blipS = requests.get('https://raw.githubusercontent.com/d3n7/GPT-4-Unlimited-Tools/main/plugins/blip3.py').content
+        blipPath = os.path.join(thispath), 'plugins', 'blip2.py')
+        with open(blipPath, 'wb') as f:
+            f.write(blipS)
+        st.session_state['displayChat'] = False
 if 'followup' not in st.session_state:
     st.session_state['followup'] = False
 if 'followupPrompt' not in st.session_state:
@@ -27,7 +31,9 @@ if 'history' not in st.session_state:
     st.session_state['history'] = []
 if 'running' not in st.session_state:
     st.session_state['running'] = False
-regx = [r'[A-Z]+\((?:[^()]*|\([^()]*\))*\)', r'''(?:"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|\b[^,]+)'''] #parsing commands, parsing arguments
+if 'downloadable' not in st.session_state:
+    st.session_state['downloadable'] = False
+regx = [r"([A-Z]+\(((?:[^()\"']|(?:\"[^\"]*\")|(?:'[^']*')|\((?1)*\))*)\))", r'''(?:"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|\b[^,]+)'''] #parsing commands, parsing arguments
 sysPrompt = 'You now have access to some commands to help complete the user\'s request. You are able to access the user\'s machine with these commands. In every message you send, include "COMMAND: " with your command at the end. Here is a list of commands with explanations of how they are used:\n{}\n When you use a command, the user will respond with "Response: " followed by the output of the commmand. Use this output to help the user complete their request.'
 
 def formatTable(table):
@@ -43,14 +49,33 @@ st.markdown('Made by [d3nt](https://github.com/d3n7) to give GPT-4 access to any
 #User inputs
 st.markdown('### OpenAI Settings')
 openaikey = st.text_input('OpenAI API Key', type='password')
+replicatekey = st.text_input('(OPTIONAL) Replicate API Key', type='password')
 modelV = st.selectbox('Model', ('GPT-4', 'GPT-3.5-Turbo'))
 st.markdown('### Editable Knowledge Base\nDelete any commands will not need to save tokens and increase accuracy.\n\nBe careful with the Raw Translation column. This is code that gets executed by your machine.')
-d = {'GPT Commands': ['GOOGLE("question")', 'PYTHON(script.py)', 'MAKEFILE("content\\nhere", filename.txt)', 'READFILE(filename.txt)', 'LISTFILES()'],
-     'GPT Explanations': ['Search Google with the given text and return the results', 'Run a python script with the given file name. Do not use quotes for the filename argument.', 'Make a file with the given content and file name.', 'Read the content of a given filename', 'List the files you have access to'],
-     'Raw Translation': ['python plugins/google.py {}', 'python files/{}', 'echo {} > files/{}', 'cat files/{}', 'ls files']
+d = {'GPT Commands': ['GOOGLE("question")', 'PYTHON(script.py)', 'MAKEFILE("content\\nhere", filename.txt)', 'READFILE(filename.txt)', 'LISTFILES()', 'BLIP("What\'s in this image?", img1.jpg)'],
+     'GPT Explanations': ['Search Google with the given text and return the results', 'Run a python script with the given file name. Do not use quotes for the filename argument.', 'Make a file with the given content and file name.', 'Read the content of a given filename', 'List the files you have access to', 'Ask BLIP-2, a vision model, a given question about a given image'],
+     'Raw Translation': ['python plugins/google.py {}', 'python files/{}', 'echo {} > files/{}', 'cat files/{}', 'ls files', 'python plugins/blip2.py {} {}']
      }
 df = pd.DataFrame(data=d, dtype='string')
 commandTable = st.experimental_data_editor(df, use_container_width=True, num_rows='dynamic')
+cola, colb, colc = st.columns(3)
+st.markdown('### Upload/Download')
+uploadFile = st.file_uploader('')
+with cola:
+    if st.button('Upload'):
+        if uploadFile:
+            fname = os.path.join(thispath, 'files', uploadFile.name.split('.')[-1])
+            with open(fname, 'wb') as f:
+                f.write(uploadFile.getbuffer())
+            st.write('Success')
+with colb:
+    if st.button('Download'):
+        shutil.make_archive(os.join(thispath, 'files.zip'), 'zip', os.join(thispath, 'files'))
+        st.session_state['downloadable'] = True
+with colc:
+    if st.session_state['downloadble']:
+        with open(os.path.join(thispath, 'files.zip'), 'rb') as f:
+            st.download_button('Download Zip', f, file_name='file.zip', key='filezip')
 st.markdown('### Chat')
 prompt = st.text_input('Message')
 col1, col2, col3, col4 = st.columns(4)
@@ -77,6 +102,7 @@ def runCmd(flag):
         with st.spinner('Running command \'' + st.session_state['command'] + '\''):
             try:
                 p = subprocess.Popen(st.session_state['command'], shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE)
+                p.wait()
                 st.session_state['followupPrompt'] = 'Response: ' + p.communicate()[0].decode("utf-8")
             except subprocess.CalledProcessError as e:
                 st.session_state['followupPrompt'] = 'Response: ' + e.output.decode("utf-8")
@@ -88,6 +114,7 @@ def runCmd(flag):
 
 if st.session_state['running']:
     st.session_state['running'] = False
+    os.environ['REPLICATE_API_TOKEN'] = replicatekey
     if prompt != '' and openaikey != '':
         if (newSession or st.session_state['history'] == []) and (not st.session_state['followup']):
             st.session_state['history'] = [{'role': 'system', 'content': sysPrompt.format(formatTable(commandTable))}]
@@ -103,8 +130,8 @@ if st.session_state['running']:
             response = askGPT(prompt)
 
         #parse GPT commands, possible recursion
-        if len(re.findall(regx[0], response)) >= 1:
-            cmd = re.findall(regx[0], response)[0]
+        if len(regex.findall(regx[0], response)) >= 1:
+            cmd = regex.findall(regx[0], response)[0][0]
             stem = ''
             rawArgs = ''
             cmdId = -1
@@ -174,12 +201,12 @@ if st.session_state['displayChat']:
         if i['role'] == 'user':
             if not showAll:
                 if 'Response:' not in i['content']:
-                    message(i['content'], is_user=True)
+                    message(i['content'], is_user=True, key=random.randint(1,9000))
             else:
-                message(i['content'], is_user=True)
+                message(i['content'], is_user=True, key=random.randint(1,9000))
         elif i['role'] == 'assistant':
             if not showAll:
                 if 'COMMAND' not in i['content']:
-                    message(i['content'])
+                    message(i['content'], key=random.randint(1,9000))
             else:
-                message(i['content'])
+                message(i['content'], key=random.randint(1,9000))