KBlueLeaf commited on
Commit
627e398
1 Parent(s): 862f844

Update peewee schema

Browse files
Files changed (2) hide show
  1. db.py +112 -49
  2. db_utils.py +2 -8
db.py CHANGED
@@ -1,13 +1,41 @@
1
- import pathlib
2
  import sqlite3
3
 
4
- from numpy import base_repr
5
  from peewee import *
6
- from playhouse.sqlite_ext import FTS5Model, SearchField
7
- from playhouse.shortcuts import model_to_dict
8
 
9
 
10
- db = SqliteDatabase(pathlib.Path(__file__).parent.resolve() / "danbooru2023.db")
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
11
  tag_cache_map = {}
12
 
13
 
@@ -17,23 +45,6 @@ def get_tag_by_id(id):
17
  return tag_cache_map[id]
18
 
19
 
20
- class TagListField(TextField, SearchField):
21
- def db_value(self, value):
22
- if isinstance(value, str):
23
- return value
24
- assert all(isinstance(tag, (Tag, int)) for tag in value)
25
- return "".join(
26
- f"${base_repr(tag.id, 36) if isinstance(tag, Tag) else base_repr(tag, 36)}#"
27
- for tag in value
28
- )
29
-
30
- def python_value(self, value):
31
- if value is not None:
32
- return [
33
- get_tag_by_id(int(tag, 36)) for tag in value[1:-1].split("#$") if tag
34
- ]
35
-
36
-
37
  class EnumField(IntegerField):
38
  def __init__(self, enum_list, *args, **kwargs):
39
  super().__init__(*args, **kwargs)
@@ -56,6 +67,29 @@ class BaseModel(Model):
56
  database = db
57
 
58
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
59
  class Post(BaseModel):
60
  id = IntegerField(primary_key=True)
61
  created_at = CharField()
@@ -87,12 +121,9 @@ class Post(BaseModel):
87
  large_file_url = CharField()
88
  preview_file_url = CharField()
89
 
90
- tag_list = TagListField()
91
- tag_list_general = TagListField()
92
- tag_list_artist = TagListField()
93
- tag_list_character = TagListField()
94
- tag_list_copyright = TagListField()
95
- tag_list_meta = TagListField()
96
 
97
  tag_count = IntegerField()
98
  tag_count_general = IntegerField()
@@ -101,32 +132,64 @@ class Post(BaseModel):
101
  tag_count_copyright = IntegerField()
102
  tag_count_meta = IntegerField()
103
 
 
 
 
 
 
104
 
105
- class PostFTS(FTS5Model):
106
- class Meta:
107
- database = db
108
 
109
- tag_list = TagListField()
110
- tag_list_general = TagListField()
111
- tag_list_artist = TagListField()
112
- tag_list_character = TagListField()
113
- tag_list_copyright = TagListField()
114
- tag_list_meta = TagListField()
115
 
 
 
 
116
 
117
- class Tag(BaseModel):
118
- id = IntegerField(primary_key=True)
119
- name = CharField(unique=True)
120
- type = EnumField(["general", "artist", "character", "copyright", "meta"])
121
- popularity = IntegerField()
122
 
123
- def __str__(self):
124
- return f"<Tag: {self.name}>"
 
125
 
126
 
127
- if __name__ == "__main__":
 
 
 
 
 
 
 
 
 
 
 
 
 
 
128
  db.connect()
129
- for index in db.get_indexes("post"):
130
- print(index)
131
- post = Post.select().first()
132
- print(model_to_dict(post))
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  import sqlite3
2
 
 
3
  from peewee import *
 
 
4
 
5
 
6
+ class MemoryConnection(sqlite3.Connection):
7
+ def __init__(self, dbname, *args, **kwargs):
8
+ load_conn = sqlite3.connect(dbname)
9
+ super(MemoryConnection, self).__init__(":memory:", *args, **kwargs)
10
+ load_conn.backup(self)
11
+ load_conn.close()
12
+
13
+
14
+ class SqliteMemDatabase(SqliteDatabase):
15
+ def __init__(self, database, *args, **kwargs) -> None:
16
+ self.dbname = database
17
+ super().__init__(database, *args, factory=MemoryConnection, **kwargs)
18
+
19
+ def reload(self, dbname=None):
20
+ if dbname is None:
21
+ dbname = self.dbname
22
+ load_conn = sqlite3.connect(dbname)
23
+ try:
24
+ load_conn.backup(self._state.conn)
25
+ finally:
26
+ load_conn.close()
27
+
28
+ def save(self, dbname=None):
29
+ if dbname is None:
30
+ dbname = self.dbname
31
+ save_conn = sqlite3.connect(dbname)
32
+ try:
33
+ self._state.conn.backup(save_conn)
34
+ finally:
35
+ save_conn.close()
36
+
37
+
38
+ db: SqliteDatabase = None
39
  tag_cache_map = {}
40
 
41
 
 
45
  return tag_cache_map[id]
46
 
47
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
48
  class EnumField(IntegerField):
49
  def __init__(self, enum_list, *args, **kwargs):
50
  super().__init__(*args, **kwargs)
 
67
  database = db
68
 
69
 
70
+ class Tag(BaseModel):
71
+ id = IntegerField(primary_key=True)
72
+ name = CharField(unique=True)
73
+ type = EnumField(["general", "artist", "character", "copyright", "meta"])
74
+ popularity = IntegerField()
75
+ _posts: ManyToManyField
76
+ _posts_cache = None
77
+
78
+ @property
79
+ def posts(self):
80
+ if self._posts_cache is None:
81
+ self._posts_cache = list(self._posts)
82
+ return self._posts_cache
83
+
84
+ def __str__(self):
85
+ return f"<Tag '{self.name}'>"
86
+
87
+ def __repr__(self):
88
+ from objprint import objstr
89
+
90
+ return f"<Tag|#{self.id}|{self.name}|{self.type[:2]}>"
91
+
92
+
93
  class Post(BaseModel):
94
  id = IntegerField(primary_key=True)
95
  created_at = CharField()
 
121
  large_file_url = CharField()
122
  preview_file_url = CharField()
123
 
124
+ _tags: ManyToManyField
125
+ _tags_cache = None
126
+ _tag_list = TextField(column_name="tag_list")
 
 
 
127
 
128
  tag_count = IntegerField()
129
  tag_count_general = IntegerField()
 
132
  tag_count_copyright = IntegerField()
133
  tag_count_meta = IntegerField()
134
 
135
+ @property
136
+ def tag_list(self):
137
+ if self._tags_cache is None:
138
+ self._tags_cache = list(self._tags)
139
+ return self._tags_cache
140
 
141
+ @property
142
+ def tag_list_general(self):
143
+ return [tag for tag in self.tag_list if tag.type == "general"]
144
 
145
+ @property
146
+ def tag_list_artist(self):
147
+ return [tag for tag in self.tag_list if tag.type == "artist"]
 
 
 
148
 
149
+ @property
150
+ def tag_list_character(self):
151
+ return [tag for tag in self.tag_list if tag.type == "character"]
152
 
153
+ @property
154
+ def tag_list_copyright(self):
155
+ return [tag for tag in self.tag_list if tag.type == "copyright"]
 
 
156
 
157
+ @property
158
+ def tag_list_meta(self):
159
+ return [tag for tag in self.tag_list if tag.type == "meta"]
160
 
161
 
162
+ class PostTagRelation(BaseModel):
163
+ post = ForeignKeyField(Post, backref="post_tags")
164
+ tag = ForeignKeyField(Tag, backref="tag_posts")
165
+
166
+
167
+ tags = ManyToManyField(Tag, backref="_posts", through_model=PostTagRelation)
168
+ tags.bind(Post, "_tags", set_attribute=True)
169
+
170
+
171
+ def load_db(db_file: str):
172
+ global db
173
+ db = SqliteDatabase(db_file)
174
+ Post._meta.database = db
175
+ Tag._meta.database = db
176
+ PostTagRelation._meta.database = db
177
  db.connect()
178
+
179
+
180
+ if __name__ == "__main__":
181
+ load_db("danbooru2023.db")
182
+ post = Post.get_by_id(1)
183
+ print(post.tag_count_general, len(post.tag_list_general), post.tag_list_general)
184
+ print(post.tag_count_artist, len(post.tag_list_artist), post.tag_list_artist)
185
+ print(
186
+ post.tag_count_character, len(post.tag_list_character), post.tag_list_character
187
+ )
188
+ print(
189
+ post.tag_count_copyright, len(post.tag_list_copyright), post.tag_list_copyright
190
+ )
191
+ print(post.tag_count_meta, len(post.tag_list_meta), post.tag_list_meta)
192
+
193
+ tag = Tag.select().where(Tag.name == "umamusume").first()
194
+ print(tag)
195
+ print(len(tag.posts))
db_utils.py CHANGED
@@ -1,14 +1,8 @@
1
- from numpy import base_repr
2
  from db import *
3
 
4
 
5
  def get_post_by_tag(tag: Tag):
6
- id_str = f''"${base_repr(tag.id, 36)}#''"
7
- return (
8
- Post.select()
9
- .join(PostFTS, on=(Post.id == PostFTS.rowid))
10
- .where(PostFTS.tag_list.contains(id_str))
11
- )
12
 
13
 
14
  def get_tag_by_name(name: str):
@@ -16,4 +10,4 @@ def get_tag_by_name(name: str):
16
 
17
 
18
  def get_tags_by_popularity(n: int):
19
- return Tag.select().where(Tag.popularity >= n)
 
 
1
  from db import *
2
 
3
 
4
  def get_post_by_tag(tag: Tag):
5
+ return list(tag.posts)
 
 
 
 
 
6
 
7
 
8
  def get_tag_by_name(name: str):
 
10
 
11
 
12
  def get_tags_by_popularity(n: int):
13
+ return Tag.select().where(Tag.popularity >= n)