Update app.py

app.py

@@ -108,18 +108,18 @@ class TextEditor:
             chunk['text'] = chunk['text'][:start] + chunk['text'][end:]
             self.memory.update_chunk(chunk_id, chunk['text'])
             logger.info(f"Cut text from chunk: {chunk_id}, start: {start}, end: {end}, clipboard: {self.clipboard}")
-        else:
-            logger.warning(f"Failed to cut text, chunk not found: {chunk_id}")
-        return chunk['text']
+            return chunk['text']
+        logger.warning(f"Failed to cut text, chunk not found: {chunk_id}")
+        return "Error: Chunk not found"
         
     def copy(self, chunk_id, start, end):
         chunk = self.memory.get_chunk(chunk_id)
         if chunk:
             self.clipboard = chunk['text'][start:end]
             logger.info(f"Copied text from chunk: {chunk_id}, start: {start}, end: {end}, clipboard: {self.clipboard}")
-        else:
-            logger.warning(f"Failed to copy text, chunk not found: {chunk_id}")
-        return self.clipboard
+            return self.clipboard
+        logger.warning(f"Failed to copy text, chunk not found: {chunk_id}")
+        return "Error: Chunk not found"
         
     def paste(self, chunk_id, position):
         chunk = self.memory.get_chunk(chunk_id)
@@ -127,9 +127,9 @@ class TextEditor:
             chunk['text'] = chunk['text'][:position] + self.clipboard + chunk['text'][position:]
             self.memory.update_chunk(chunk_id, chunk['text'])
             logger.info(f"Pasted text to chunk: {chunk_id}, position: {position}, clipboard: {self.clipboard}")
-        else:
-            logger.warning(f"Failed to paste text, chunk not found: {chunk_id}")
-        return chunk['text']
+            return chunk['text']
+        logger.warning(f"Failed to paste text, chunk not found: {chunk_id}")
+        return "Error: Chunk not found"
         
     def add_prefix(self, chunk_id, prefix):
         chunk = self.memory.get_chunk(chunk_id)
@@ -137,9 +137,9 @@ class TextEditor:
             chunk['text'] = prefix + chunk['text']
             self.memory.update_chunk(chunk_id, chunk['text'])
             logger.info(f"Added prefix to chunk: {chunk_id}, prefix: {prefix}")
-        else:
-            logger.warning(f"Failed to add prefix, chunk not found: {chunk_id}")
-        return chunk['text']
+            return chunk['text']
+        logger.warning(f"Failed to add prefix, chunk not found: {chunk_id}")
+        return "Error: Chunk not found"
         
     def add_suffix(self, chunk_id, suffix):
         chunk = self.memory.get_chunk(chunk_id)
@@ -147,9 +147,9 @@ class TextEditor:
             chunk['text'] = chunk['text'] + suffix
             self.memory.update_chunk(chunk_id, chunk['text'])
             logger.info(f"Added suffix to chunk: {chunk_id}, suffix: {suffix}")
-        else:
-            logger.warning(f"Failed to add suffix, chunk not found: {chunk_id}")
-        return chunk['text']
+            return chunk['text']
+        logger.warning(f"Failed to add suffix, chunk not found: {chunk_id}")
+        return "Error: Chunk not found"
         
     def diff(self, chunk_id, original_text):
         chunk = self.memory.get_chunk(chunk_id)
@@ -380,30 +380,61 @@ def get_logs():
         return f"Error reading logs: {str(e)}"
 
 def select_chunk(evt: gr.SelectData):
-    logger.info(f"Selected chunk: {evt.value[0]}")
+    logger.info(f"Selected chunk: {evt.value}")
     return evt.value[0], evt.value[1]
 
 async def edit_cut(chunk_id, start, end):
+    logger.info(f"edit_cut called with chunk_id: {chunk_id}, start: {start}, end: {end}")
+    try:
+        # Validate chunk_id as a UUID
+        uuid.UUID(chunk_id, version=4)
+    except ValueError:
+        logger.warning(f"Invalid chunk_id: {chunk_id} is not a valid UUID")
+        return "Error: Invalid chunk_id", ""
     api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.cut(chunk_id, int(start), int(end))
     return result, api.editor.diff(chunk_id, result)
 
 async def edit_copy(chunk_id, start, end):
+    logger.info(f"edit_copy called with chunk_id: {chunk_id}, start: {start}, end: {end}")
+    try:
+        uuid.UUID(chunk_id, version=4)
+    except ValueError:
+        logger.warning(f"Invalid chunk_id: {chunk_id} is not a valid UUID")
+        return "Error: Invalid chunk_id", ""
     api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.copy(chunk_id, int(start), int(end))
     return result, ""
 
 async def edit_paste(chunk_id, position):
+    logger.info(f"edit_paste called with chunk_id: {chunk_id}, position: {position}")
+    try:
+        uuid.UUID(chunk_id, version=4)
+    except ValueError:
+        logger.warning(f"Invalid chunk_id: {chunk_id} is not a valid UUID")
+        return "Error: Invalid chunk_id", ""
     api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.paste(chunk_id, int(position))
     return result, api.editor.diff(chunk_id, result)
 
 async def edit_prefix(chunk_id, prefix):
+    logger.info(f"edit_prefix called with chunk_id: {chunk_id}, prefix: {prefix}")
+    try:
+        uuid.UUID(chunk_id, version=4)
+    except ValueError:
+        logger.warning(f"Invalid chunk_id: {chunk_id} is not a valid UUID")
+        return "Error: Invalid chunk_id", ""
     api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.add_prefix(chunk_id, prefix)
     return result, api.editor.diff(chunk_id, result)
 
 async def edit_suffix(chunk_id, suffix):
+    logger.info(f"edit_suffix called with chunk_id: {chunk_id}, suffix: {suffix}")
+    try:
+        uuid.UUID(chunk_id, version=4)
+    except ValueError:
+        logger.warning(f"Invalid chunk_id: {chunk_id} is not a valid UUID")
+        return "Error: Invalid chunk_id", ""
     api = OpenAIApi(api_key=os.getenv("AZURE_OPENAI_API_KEY"))
     result = api.editor.add_suffix(chunk_id, suffix)
     return result, api.editor.diff(chunk_id, result)
@@ -429,13 +460,14 @@ def create_ui():
                 label="Recent Chunks",
                 headers=["chunk_id", "text", "role", "timestamp", "intent", "token_count"],
                 datatype=["str", "str", "str", "str", "str", "number"],
-                interactive=False
+                interactive=False,
+                key="history_df"
             )
             history_btn = gr.Button("Refresh History")
-            history_btn.click(fn=get_history, outputs=history)
+            history_btn.click(fn=get_history, outputs=history, _js="() => new Promise(resolve => setTimeout(resolve, 200))")
         
         with gr.Tab("Text Editor"):
-            chunk_id = gr.Textbox(label="Selected Chunk ID")
+            chunk_id = gr.Textbox(label="Selected Chunk ID", interactive=False)
             chunk_text = gr.Textbox(label="Chunk Text", interactive=False)
             history.select(fn=select_chunk, outputs=[chunk_id, chunk_text])