Skip to content

Commit 8109ef6

Browse files
author
Gavroche
committed
cleanup plugin model loading
1 parent fedfa0d commit 8109ef6

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

app/models/all.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,8 @@ def load_plugin_tables():
3131
if not os.path.exists(os.path.join(plugin_dir, 'database.py')):
3232
continue # Skip plugins without a database.py file
3333

34-
plugin_module = import_module(f'plugins.{plugin_name}.database')
35-
# plugin_metadata = plugin_module.metadata
34+
import_module(f'plugins.{plugin_name}.database')
3635

37-
# # # Copy the tables from the main metadata to the plugin metadata object
38-
# # for table_name in plugin_metadata.tables:
39-
# # table = plugin_metadata.tables[table_name]
40-
# # table.schema = None # Reset the schema to avoid conflicts
41-
# # table.metadata = metadata
4236

4337

4438
class ConversationBase(SQLModel):
@@ -68,3 +62,5 @@ class MessageRead(MessageBase):
6862

6963
class ConversationWithMessages(ConversationRead):
7064
messages: List[MessageRead] = []
65+
66+
load_plugin_tables()

app/plugins/sample_plugin/database.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
from sqlmodel import SQLModel, Field, Relationship
44
from models.all import Conversation
55

6-
metadata = SQLModel.metadata
7-
86
class SamplePluginModelBase(SQLModel):
97
"""A base model for SamplePluginModel"""
108
# __tablename__: str = 'sample_plugin_model'
119
created_at: datetime = Field(default_factory=datetime.utcnow)
1210
title: Optional[str]
11+
conversation_id: Optional[int] = Field(default=None, foreign_key="conversation.id")
1312

1413
class SamplePluginModel(SamplePluginModelBase, table=True):
1514
"""A model for SamplePlugin"""

0 commit comments

Comments
 (0)