Commit c9b85bd4 authored by Timothy J. Baek's avatar Timothy J. Baek
Browse files

fix: delete

parent 0d70d7c9
...@@ -195,6 +195,7 @@ class AuthsTable: ...@@ -195,6 +195,7 @@ class AuthsTable:
if result: if result:
db.query(Auth).filter_by(id=id).delete() db.query(Auth).filter_by(id=id).delete()
db.commit()
return True return True
else: else:
......
...@@ -171,6 +171,8 @@ class ChatTable: ...@@ -171,6 +171,8 @@ class ChatTable:
with get_db() as db: with get_db() as db:
db.query(Chat).filter_by(user_id=f"shared-{chat_id}").delete() db.query(Chat).filter_by(user_id=f"shared-{chat_id}").delete()
db.commit()
return True return True
except: except:
return False return False
...@@ -323,6 +325,7 @@ class ChatTable: ...@@ -323,6 +325,7 @@ class ChatTable:
with get_db() as db: with get_db() as db:
db.query(Chat).filter_by(id=id).delete() db.query(Chat).filter_by(id=id).delete()
db.commit()
return True and self.delete_shared_chat_by_chat_id(id) return True and self.delete_shared_chat_by_chat_id(id)
except: except:
...@@ -333,6 +336,7 @@ class ChatTable: ...@@ -333,6 +336,7 @@ class ChatTable:
with get_db() as db: with get_db() as db:
db.query(Chat).filter_by(id=id, user_id=user_id).delete() db.query(Chat).filter_by(id=id, user_id=user_id).delete()
db.commit()
return True and self.delete_shared_chat_by_chat_id(id) return True and self.delete_shared_chat_by_chat_id(id)
except: except:
...@@ -346,6 +350,8 @@ class ChatTable: ...@@ -346,6 +350,8 @@ class ChatTable:
self.delete_shared_chats_by_user_id(user_id) self.delete_shared_chats_by_user_id(user_id)
db.query(Chat).filter_by(user_id=user_id).delete() db.query(Chat).filter_by(user_id=user_id).delete()
db.commit()
return True return True
except: except:
return False return False
...@@ -359,6 +365,7 @@ class ChatTable: ...@@ -359,6 +365,7 @@ class ChatTable:
shared_chat_ids = [f"shared-{chat.id}" for chat in chats_by_user] shared_chat_ids = [f"shared-{chat.id}" for chat in chats_by_user]
db.query(Chat).filter(Chat.user_id.in_(shared_chat_ids)).delete() db.query(Chat).filter(Chat.user_id.in_(shared_chat_ids)).delete()
db.commit()
return True return True
except: except:
......
...@@ -104,6 +104,8 @@ class FilesTable: ...@@ -104,6 +104,8 @@ class FilesTable:
try: try:
db.query(File).filter_by(id=id).delete() db.query(File).filter_by(id=id).delete()
db.commit()
return True return True
except: except:
return False return False
...@@ -114,6 +116,8 @@ class FilesTable: ...@@ -114,6 +116,8 @@ class FilesTable:
try: try:
db.query(File).delete() db.query(File).delete()
db.commit()
return True return True
except: except:
return False return False
......
...@@ -267,9 +267,10 @@ class FunctionsTable: ...@@ -267,9 +267,10 @@ class FunctionsTable:
def delete_function_by_id(self, id: str) -> bool: def delete_function_by_id(self, id: str) -> bool:
with get_db() as db: with get_db() as db:
try: try:
db.query(Function).filter_by(id=id).delete() db.query(Function).filter_by(id=id).delete()
db.commit()
return True return True
except: except:
return False return False
......
...@@ -115,6 +115,8 @@ class MemoriesTable: ...@@ -115,6 +115,8 @@ class MemoriesTable:
try: try:
db.query(Memory).filter_by(id=id).delete() db.query(Memory).filter_by(id=id).delete()
db.commit()
return True return True
except: except:
...@@ -125,6 +127,8 @@ class MemoriesTable: ...@@ -125,6 +127,8 @@ class MemoriesTable:
try: try:
db.query(Memory).filter_by(user_id=user_id).delete() db.query(Memory).filter_by(user_id=user_id).delete()
db.commit()
return True return True
except: except:
return False return False
...@@ -134,6 +138,8 @@ class MemoriesTable: ...@@ -134,6 +138,8 @@ class MemoriesTable:
try: try:
db.query(Memory).filter_by(id=id, user_id=user_id).delete() db.query(Memory).filter_by(id=id, user_id=user_id).delete()
db.commit()
return True return True
except: except:
return False return False
......
...@@ -176,6 +176,8 @@ class ModelsTable: ...@@ -176,6 +176,8 @@ class ModelsTable:
with get_db() as db: with get_db() as db:
db.query(Model).filter_by(id=id).delete() db.query(Model).filter_by(id=id).delete()
db.commit()
return True return True
except: except:
return False return False
......
...@@ -109,6 +109,8 @@ class PromptsTable: ...@@ -109,6 +109,8 @@ class PromptsTable:
with get_db() as db: with get_db() as db:
db.query(Prompt).filter_by(command=command).delete() db.query(Prompt).filter_by(command=command).delete()
db.commit()
return True return True
except: except:
return False return False
......
...@@ -225,6 +225,7 @@ class TagTable: ...@@ -225,6 +225,7 @@ class TagTable:
if tag_count == 0: if tag_count == 0:
# Remove tag item from Tag col as well # Remove tag item from Tag col as well
db.query(Tag).filter_by(name=tag_name, user_id=user_id).delete() db.query(Tag).filter_by(name=tag_name, user_id=user_id).delete()
db.commit()
return True return True
except Exception as e: except Exception as e:
log.error(f"delete_tag: {e}") log.error(f"delete_tag: {e}")
...@@ -250,6 +251,7 @@ class TagTable: ...@@ -250,6 +251,7 @@ class TagTable:
if tag_count == 0: if tag_count == 0:
# Remove tag item from Tag col as well # Remove tag item from Tag col as well
db.query(Tag).filter_by(name=tag_name, user_id=user_id).delete() db.query(Tag).filter_by(name=tag_name, user_id=user_id).delete()
db.commit()
return True return True
except Exception as e: except Exception as e:
......
...@@ -201,6 +201,8 @@ class ToolsTable: ...@@ -201,6 +201,8 @@ class ToolsTable:
try: try:
with get_db() as db: with get_db() as db:
db.query(Tool).filter_by(id=id).delete() db.query(Tool).filter_by(id=id).delete()
db.commit()
return True return True
except: except:
return False return False
......
...@@ -233,7 +233,10 @@ async def delete_function_by_id( ...@@ -233,7 +233,10 @@ async def delete_function_by_id(
# delete the function file # delete the function file
function_path = os.path.join(FUNCTIONS_DIR, f"{id}.py") function_path = os.path.join(FUNCTIONS_DIR, f"{id}.py")
try:
os.remove(function_path) os.remove(function_path)
except:
pass
return result return result
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment