Update app.py

app.py

@@ -155,7 +155,7 @@ def run_gpt(
         print(LOG_RESPONSE.format(resp))
     return resp
 
-def compress_data(c,purpose, task, history):
+def compress_data(c,purpose, task, history, result):
     seed=random.randint(1,1000000000)
     
     print (c)
@@ -194,17 +194,17 @@ def compress_data(c,purpose, task, history):
         out+=resp
         e=e+chunk
         s=s+chunk
-    '''
+    
     resp = run_gpt(
         COMPRESS_DATA_PROMPT,
         stop_tokens=["observation:", "task:", "action:", "thought:"],
-        max_tokens=1024,
+        max_tokens=2048,
         seed=seed,
         purpose=purpose,
         task=task,
         knowledge=new_history,
-        history="All data has been recieved.",
-    )'''
+        history=result,
+    )
     print ("final" + resp)
     history = "result: {}\n".format(resp)
     return history
@@ -226,7 +226,7 @@ def compress_history(purpose, task, history):
     return history
 
 
-def call_main(purpose, task, history, action_input):
+def call_main(purpose, task, history, action_input, result):
     resp = run_gpt(
         FINDER,
         stop_tokens=["observation:", "task:"],
@@ -256,10 +256,10 @@ def call_main(purpose, task, history, action_input):
             #return "UPDATE-TASK", None, history, task
     if "VERBOSE":
         print(history)
-    return "MAIN", None, history, task
+    return "MAIN", None, history, task, result
 
 
-def call_set_task(purpose, task, history, action_input):
+def call_set_task(purpose, task, history, action_input, result):
     task = run_gpt(
         TASK_PROMPT,
         stop_tokens=[],
@@ -270,7 +270,7 @@ def call_set_task(purpose, task, history, action_input):
         history=history,
     ).strip("\n")
     history += "observation: task has been updated to: {}\n".format(task)
-    return "MAIN", None, history, task
+    return "MAIN", None, history, task, result
 
 
 
@@ -281,7 +281,7 @@ def search_all(url):
 
 
 
-def find_all(purpose,task,history, url):
+def find_all(purpose,task,history, url, result):
     return_list=[]
     print (url)
     #if action_input in query.tasks:
@@ -326,71 +326,31 @@ def find_all(purpose,task,history, url):
             print (f'c:: {c}')
             if c > MAX_HISTORY:
                 print("compressing...")
-                rawp = compress_data(c,purpose,task,out)  
-                result = rawp
+                rawp = compress_data(c,purpose,task,out,result)  
             else:
                 rawp = out 
+            result += rawp
+                
             print (rawp)
             print (f'out:: {out}')
-            history = "observation: the search results are:\n {}\n".format(rawp)
+            history += "observation: the search results are:\n {}\n".format(rawp)
             task = "compile report"
-            return "MAIN", None, history, task
+            return "MAIN", None, history, task, result
         else: 
             history += "observation: An Error occured\nI need to trigger a search using the following syntax:\naction: SCRAPE_WEBSITE action_input=URL\n"
-            return "MAIN", None, history, task
+            return "MAIN", None, history, task, result
     except Exception as e:
         print (e)
         history += "observation: I need to trigger a search using the following syntax:\naction: SCRAPE_WEBSITE action_input=URL\n"
-        return "MAIN", None, history, task
+        return "MAIN", None, history, task, result
 
         #else:
     #    history = "observation: The search query I used did not return a valid response"
         
-    return "MAIN", None, history, task
+    return "MAIN", None, history, task, result
+
 
 
-def find_it(url,q=None,num=None):
-    out = []
-    out_l = []
-    z=""
-    source = urllib.request.urlopen(url).read()
-    soup = bs4.BeautifulSoup(source,'lxml')
-    
-    for p in soup.find_all(f'{q}'):
-        if num != "":
-            z=p.get(f'{num}')
-        
-        try:
-            test = soup.select(f'{p.name}:first-child')
-            
-            #print(p.findChildren())
-        except Exception as e:
-            print (e)
-        #out.append(p)
-        out.append([{q:p.string,"additional":z,"parent":p.parent.name,"previous":[b for b in p.previous],"first-child":[b.name for b in p.children],"content":p}])
-        if p.string !=None:
-            out_l.append(p.string)
-        else:
-            out_l.append(z)
-        #out.append(p.parent.name)
-        print(dir(p))
-        print(p.parent.name)
-    for url in soup.find_all('a'):
-        print(url.get('href'))
-        
-    #print(soup.get_text())
-    return out,out_l
-    
-def find_it2(url):
-    response = requests.get(url,a1=None,q2=None,q3=None)
-    try:
-        response.raise_for_status()
-        soup = BeautifulSoup(response.content, 'lxml')
-        out = 'URL Links:\n'.join([p.text for p in soup.find_all('a')])
-        return out
-    except Exception as e:
-        print (e)
-        return e
 #################################
 
 NAME_TO_FUNC = {
@@ -401,7 +361,7 @@ NAME_TO_FUNC = {
 }
 
 
-def run_action(purpose, task, history, action_name, action_input):
+def run_action(purpose, task, history, action_name, action_input,result):
     if action_name == "COMPLETE":
         print("Complete - Exiting")
         #exit(0) 
@@ -417,14 +377,15 @@ def run_action(purpose, task, history, action_name, action_input):
         assert action_name in NAME_TO_FUNC
 
         print(f"RUN: {action_name}  ACTION_INPUT: {action_input}")
-        return NAME_TO_FUNC[action_name](purpose, task, history, action_input)
+        return NAME_TO_FUNC[action_name](purpose, task, history, action_input, result)
     else:
         history += "observation: The TOOL I tried to use returned an error, I need to select a tool from: (UPDATE-TASK, SEARCH_ENGINE, WEBSITE_SCRAPE, COMPLETE)\n"
 
-        return "MAIN", None, history, task
+        return "MAIN", None, history, task, result
 
 def run(purpose,history):
     task=None
+    result=""
     #history = ""
     if not history:
         history = ""
@@ -442,16 +403,17 @@ def run(purpose,history):
         #print(history)
         print("---")
 
-        action_name, action_input, history, task = run_action(
+        action_name, action_input, history, task, result = run_action(
             purpose,
             task,
             history,
             action_name,
             action_input,
+            result
         )
-        yield history
+        yield result
         if action_name == "COMPLETE":
-            return history
+            return result