Update app.py

app.py

@@ -124,6 +124,7 @@ def compress_history(formatted_prompt):
 
 def comment_generate(prompt, history,post_check,full_conv,persona2, agent_name=agents[0], sys_prompt="", temperature=0.9, max_new_tokens=1028, top_p=0.95, repetition_penalty=1.3,):
 #def question_generate(prompt, history):
+    current_time = str(datetime.datetime.now())
     uid=uuid.uuid4()
     print(post_check)
     #full_conv=history
@@ -164,14 +165,25 @@ def comment_generate(prompt, history,post_check,full_conv,persona2, agent_name=a
     comment_cnt=post_check['comment']
     print(type(comment_cnt))
     post_check['comment']=comment_cnt+1
+
+    comment_json= {'user':persona[persona2]['name'],'datetime':current_time,'comment':output,'reply_list':[]}
+    
+    out_json = {'user':persona[persona1]['name'],'datetime':post_check['datetime'],'file_name':post_check['filename'],
+                'title':post_check['title'],'blog':1,'comment':post_check['comment']+=1,'reply':post_check['reply'],
+    "prompt":post_check['prompt'],"output":post_check['output'],'comment_list':post_check['comment_list'].append(comment_json)}    
+    
+    
+    
+    
     #out_json = {'user':"",'datetime':current_time,'title':title,'blog':1,'comment':0,'reply':0,"prompt":prompt,"output":output}
     #full_conv[-1]+=(output,)
     full_conv.append((None,output,None))
-    html_out=load_html(full_conv,post_check['title'],post_check['user'])
+    html_out=load_html(full_conv,out_json)
 
     #out_json = {'user':list_of_users[0],'datetime':current_time,'file_name':filename,'title':title,'blog':1,'comment':0,'reply':0,"prompt":prompt,"output":output,'comment_list':[]}
     file_n = f'{post_check["filename"]}.json'
     print(file_n)
+    '''
     r = requests.get(f'{save_data}book1/{file_n}') 
     print(f'status code main:: {r.status_code}')
     if r.status_code==200:
@@ -183,26 +195,30 @@ def comment_generate(prompt, history,post_check,full_conv,persona2, agent_name=a
             #hist_out.append(out_json)
             #try:
             #    for ea in 
-            with open(f'{uid}.json', 'w') as f:
-                json_hist=json.dumps(lod, indent=4)
-                f.write(json_hist)
-            f.close()
-        
-            upload_file(
-                path_or_fileobj =f"{uid}.json", 
-                path_in_repo = f"book1/{file_n}", 
-                repo_id =f"{username}/{dataset_name}", 
-                repo_type = "dataset", 
-                token=token,
-            )
-        except Exception as e:
-            print(e)
-    return "",history,lod[0],lod[0],lod[0],html_out
+    '''
+            
+        with open(f'{uid}.json', 'w') as f:
+            json_hist=json.dumps(out_json, indent=4)
+            f.write(json_hist)
+        f.close()
+    
+        upload_file(
+            path_or_fileobj =f"{uid}.json", 
+            path_in_repo = f"book1/{file_n}", 
+            repo_id =f"{username}/{dataset_name}", 
+            repo_type = "dataset", 
+            token=token,
+        )
+        #except Exception as e:
+        #    print(e)
+    return "",history,out_json,out_json,out_json,html_out
 
 
 
 def reply_generate(prompt, history,post_check,full_conv,persona1, agent_name=agents[0], sys_prompt="", temperature=0.9, max_new_tokens=1028, top_p=0.95, repetition_penalty=1.0,):
 #def question_generate(prompt, history):
+    current_time = str(datetime.datetime.now())
+
     uid=uuid.uuid4()
     print(post_check)
     #full_conv=history
@@ -239,10 +255,34 @@ def reply_generate(prompt, history,post_check,full_conv,persona1, agent_name=age
 
     reply_cnt=post_check['reply']
     post_check['reply']=reply_cnt+1
+
+
+
+
+    out_json = {'user':persona[persona1]['name'],'datetime':post_check['datetime'],'file_name':post_check['filename'],
+                'title':post_check['title'],'blog':1,'comment':0,'reply':post_check['reply']+=1,"prompt":post_check['prompt'],"output":post_check['output'],'comment_list':post_check['comment_list']}
+
+    hist_out.append(out_json)
+    #try:
+    #    for ea in 
+    with open(f'{uid}.json', 'w') as f:
+        json_hist=json.dumps(hist_out, indent=4)
+        f.write(json_hist)
+    f.close()
+
+    upload_file(
+        path_or_fileobj =f"{uid}.json", 
+        path_in_repo = f"book1/{filename}.json", 
+        repo_id =f"{username}/{dataset_name}", 
+        repo_type = "dataset", 
+        token=token,
+    )
+
+    
     #out_json = {'user':"",'datetime':current_time,'title':title,'blog':1,'comment':0,'reply':0,"prompt":prompt,"output":output}
     #full_conv[-1]+=(output,)
     full_conv.append((None,None,output))
-    html_out=load_html(full_conv,post_check['title'],post_check['user'])
+    html_out=load_html(full_conv,post_check)
 
     file_n = f'{post_check["filename"]}.json'
     print(file_n)
@@ -274,38 +314,6 @@ def reply_generate(prompt, history,post_check,full_conv,persona1, agent_name=age
     return "",history,lod[0],lod[0],lod[0],html_out
 
 
-    
-
-def reply_generate_OG(prompt, history, agent_name=agents[0], sys_prompt="", temperature=0.9, max_new_tokens=256, top_p=0.95, repetition_penalty=1.0,):
-#def question_generate(prompt, history):
-    print("###############\nRUNNING BLOG POSTER REPLY\n###############\n")
-    seed = random.randint(1,1111111111111111)
-    agent=prompts.REPLY_TO_COMMENTER.format(focus=main_point[0])
-    system_prompt=agent
-    temperature = float(temperature)
-    if temperature < 1e-2:
-        temperature = 1e-2
-    top_p = float(top_p)
-
-    generate_kwargs = dict(
-        temperature=temperature,
-        max_new_tokens=max_new_tokens,
-        top_p=top_p,
-        repetition_penalty=repetition_penalty,
-        do_sample=True,
-        seed=seed,
-    )
-    #history.append((prompt,""))
-    formatted_prompt = format_prompt(f"{system_prompt}, {prompt}", history)
-    client=client_z[0]
-    stream = client.text_generation(formatted_prompt, **generate_kwargs, stream=True, details=True, return_full_text=False)
-    output = ""
-
-    for response in stream:
-        output += response.token.text
-    #history.append((output,history))
-
-    return output
 
 
     
@@ -325,8 +333,21 @@ def create_valid_filename(invalid_filename: str) -> str:
 
 
     
-def load_html(inp,title,user_name="None"):
+def load_html(inp,conv):
     ht=""
+    for i,ea in enumerate(inp):
+        
+        blog,comm,repl=ea
+        #print(f'outp:: {outp}')
+        #print(f'prom:: {prom}')
+        ht+=f"""<div class="div_box">"""
+        ht+=f"""<pre class="bpost"><div class="bhead"><h2>{conv['title']}</h2><br><h5>{conv['user']}</h5></div>{conv['output']}</pre>"""
+        for 
+            ht+=f"""<pre class="resp1"><div class="bhead"></div>{comm}</pre>"""
+        if repl:
+            ht+=f"""<pre class="resp2"><div class="bhead"></div>{repl}</pre>"""
+        ht+=f"""</div>"""                
+    '''
     if inp:
         for i,ea in enumerate(inp):
             
@@ -336,12 +357,14 @@ def load_html(inp,title,user_name="None"):
             ht+=f"""<div class="div_box">"""
             if blog:
                 #ht+=f"""<div class="bhead"><div><h1>$btitle</h1></div><div>$user_name</div></div>"""
-                ht+=f"""<pre class="bpost"><div class="bhead"><h2>$title</h2><br><h5>$user_name</h5></div>{blog}</pre>"""
+                ht+=f"""<pre class="bpost"><div class="bhead"><h2>{conv['title']}</h2><br><h5>{conv['user']}</h5></div>{blog}</pre>"""
             if comm:
                 ht+=f"""<pre class="resp1"><div class="bhead"></div>{comm}</pre>"""
             if repl:
                 ht+=f"""<pre class="resp2"><div class="bhead"></div>{repl}</pre>"""
             ht+=f"""</div>"""                
+        
+    '''
     with open('index.html','r') as h:
         html=h.read()
         html = html.replace("$body",f"{ht}")
@@ -452,9 +475,19 @@ def generate(prompt, history, post_check,full_conv,persona1, agent_name=agents[0
                         print(f'title:: {title}')
                         filename=create_valid_filename(f'{current_time}---{title}')
                         
-            out_json = {'user':persona[persona1]['name'],'datetime':current_time,'file_name':filename,'title':title,'blog':1,'comment':0,'reply':0,"prompt":prompt,"output":output,'comment_list':[]}
+            #out_json = {'user':persona[persona1]['name'],'datetime':current_time,'file_name':filename,'title':title,'blog':1,'comment':0,'reply':0,"prompt":prompt,"output":output,'comment_list':[]}
+
+            
+            
+            reply_json= {'user':'','datetime':'','reply':''}
+            
+            comment_json= {'user':'','datetime':'','comment':'','reply_list':[reply_json]}
+            
+            out_json = {'user':persona[persona1]['name'],'datetime':current_time,'file_name':filename,
+                        'title':title,'blog':1,'comment':0,'reply':0,
+            "prompt":prompt,"output":output,'comment_list':[comment_json]}  
 
-            hist_out.append(out_json)
+            #hist_out.append(out_json)
             #try:
             #    for ea in 
             with open(f'{uid}.json', 'w') as f:
@@ -497,145 +530,12 @@ def generate(prompt, history, post_check,full_conv,persona1, agent_name=agents[0
         full_conv.append((output,None,None))
     
     
-        html_out=load_html(full_conv,title,persona[persona1]['name'])
-        post_check={'filename':filename,'user':persona[persona1]['name'],'datetime':current_time,'title':title,'blog':1,'comment':0,'reply':0}
-        yield prompt, history,post_check,full_conv,summary[0],json_obj,json_hist,html_out
+        html_out=load_html(full_conv,out_json)
+        #post_check={'filename':filename,'user':persona[persona1]['name'],'datetime':current_time,'title':title,'blog':1,'comment':0,'reply':0}
+        yield prompt, history,out_json,full_conv,summary[0],out_json,json_hist,html_out
     else:
         print("passing blog")
 
-def generate_OG(prompt, history, agent_name=agents[0], sys_prompt="", temperature=0.9, max_new_tokens=1048, top_p=0.95, repetition_penalty=1.0):
-    html_out=""
-    #main_point[0]=prompt
-    #print(datetime.datetime.now())
-    uid=uuid.uuid4()
-    current_time = str(datetime.datetime.now())
-    title=""
-    filename=create_valid_filename(f'{current_time}---{title}')
-    
-    current_time=current_time.replace(":","-")
-    current_time=current_time.replace(".","-")
-    print (current_time)
-    agent=prompts.BLOG_POSTER
-    system_prompt=agent
-    temperature = float(temperature)
-    if temperature < 1e-2:
-        temperature = 1e-2
-    top_p = float(top_p)
-    hist_out=[]
-    sum_out=[]
-    json_hist={}
-    json_obj={}
-    full_conv=[]
-    post_cnt=1
-    while True:
-        seed = random.randint(1,1111111111111111)
-        if post_cnt==1:
-            generate_kwargs = dict(
-                temperature=temperature,
-                max_new_tokens=max_new_tokens2,
-                top_p=top_p,
-                repetition_penalty=repetition_penalty,
-                do_sample=True,
-                seed=seed,
-            )    
-            if prompt.startswith(' \"'):
-                prompt=prompt.strip(' \"')
-
-            formatted_prompt = format_prompt(f"{system_prompt}, {prompt}", history)
-            
-            post_cnt+=1
-        else:
-            system_prompt=prompts.REPLY_TO_COMMENTER.format(focus=main_point[0])
-    
-            generate_kwargs = dict(
-                temperature=temperature,
-                max_new_tokens=max_new_tokens2,
-                top_p=top_p,
-                repetition_penalty=repetition_penalty,
-                do_sample=True,
-                seed=seed,
-            )    
-            if prompt.startswith(' \"'):
-                prompt=prompt.strip(' \"')
-            
-            formatted_prompt = format_prompt(f"{system_prompt}, {prompt}", history)
-            print("###############\nRUNNING REPLY TO COMMENTER\n###############\n")
-            print (system_prompt)
-        if len(formatted_prompt) < (40000):
-            print(len(formatted_prompt))
-
-            client=client_z[0]
-            stream = client.text_generation(formatted_prompt, **generate_kwargs, stream=True, details=True, return_full_text=False)
-            output = ""
-            #if history:
-            #    yield history
-        
-            for response in stream:
-                output += response.token.text
-                yield '', [(prompt,output)],summary[0],json_obj, json_hist,html_out
-            
-            if not title:
-                for line in output.split("\n"):
-                    if "title" in line.lower() and ":" in line.lower():
-                        title = line.split(":")[1]
-                        print(f'title:: {title}')
-                        filename=create_valid_filename(f'{current_time}---{title}')
-                        
-            out_json = {"prompt":prompt,"output":output}
-        
-            prompt = question_generate(output, history)
-            #output += prompt
-            history.append((prompt,output))
-            print ( f'Prompt:: {len(prompt)}')
-            #print ( f'output:: {output}')
-            print ( f'history:: {len(formatted_prompt)}')
-            hist_out.append(out_json)
-            #try:
-            #    for ea in 
-            with open(f'{uid}.json', 'w') as f:
-                json_hist=json.dumps(hist_out, indent=4)
-                f.write(json_hist)
-            f.close()
-        
-            upload_file(
-                path_or_fileobj =f"{uid}.json", 
-                path_in_repo = f"book1/{filename}.json", 
-                repo_id =f"{username}/{dataset_name}", 
-                repo_type = "dataset", 
-                token=token,
-            )
-        else:
-            formatted_prompt = format_prompt(f"{prompts.COMPRESS_HISTORY_PROMPT.format(history=summary[0],focus=main_point[0])}, {summary[0]}", history)
-            
-            #current_time = str(datetime.datetime.now().timestamp()).split(".",1)[0]
-            #filename=f'{filename}-{current_time}'
-            history = []
-            output = compress_history(formatted_prompt)
-            summary[0]=output
-            sum_json = {"summary":summary[0]}
-            sum_out.append(sum_json)
-            with open(f'{uid}-sum.json', 'w') as f:
-                json_obj=json.dumps(sum_out, indent=4)
-                f.write(json_obj)
-            f.close()
-            upload_file(
-                path_or_fileobj =f"{uid}-sum.json", 
-                path_in_repo = f"book1/{filename}-summary.json", 
-                repo_id =f"{username}/{dataset_name}", 
-                repo_type = "dataset", 
-                token=token,
-            )
-
-           
-            prompt = question_generate(output, history)
-        main_point[0]=prompt
-        full_conv.append((output,prompt))
-
-
-        html_out=load_html(full_conv,title)
-        yield prompt, history, summary[0],json_obj,json_hist,html_out
-    return prompt, history, summary[0],json_obj,json_hist,html_out
-