TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 18:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run classifier for item entities (concerned, correspondent)

Browse Source 
Store the results separately from nlp results in attachment metadata.
This commit is contained in:
Eike Kettner
2021-01-19 22:04:13 +01:00
parent d124f0c1a9
commit 1cd3441462
13 changed files with 131 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/store/src/main/resources/db/migration/h2/V1.19.0__add_classify_meta.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE "attachmentmeta"
ADD COLUMN "classify_proposals" text;

3
modules/store/src/main/resources/db/migration/mariadb/V1.19.0__add_classify_meta.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE `attachmentmeta`
ADD COLUMN (`classify_proposals` mediumtext);

3
modules/store/src/main/resources/db/migration/postgresql/V1.19.0__add_classify_meta.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE "attachmentmeta"
ADD COLUMN "classify_proposals" text;

42
modules/store/src/main/scala/docspell/store/records/RAttachmentMeta.scala
View File

@ -16,7 +16,8 @@ case class RAttachmentMeta(
nerlabels: List[NerLabel],
proposals: MetaProposalList,
pages: Option[Int],
language: Option[Language]
language: Option[Language],
classifyProposals: Option[MetaProposalList]
) {
def setContentIfEmpty(txt: Option[String]): RAttachmentMeta =
@ -29,19 +30,28 @@ case class RAttachmentMeta(
object RAttachmentMeta {
def empty(attachId: Ident, lang: Language) =
RAttachmentMeta(attachId, None, Nil, MetaProposalList.empty, None, Some(lang))
RAttachmentMeta(attachId, None, Nil, MetaProposalList.empty, None, Some(lang), None)
final case class Table(alias: Option[String]) extends TableDef {
val tableName = "attachmentmeta"
val id = Column[Ident]("attachid", this)
val content = Column[String]("content", this)
val nerlabels = Column[List[NerLabel]]("nerlabels", this)
val proposals = Column[MetaProposalList]("itemproposals", this)
val pages = Column[Int]("page_count", this)
val language = Column[Language]("language", this)
val id = Column[Ident]("attachid", this)
val content = Column[String]("content", this)
val nerlabels = Column[List[NerLabel]]("nerlabels", this)
val proposals = Column[MetaProposalList]("itemproposals", this)
val pages = Column[Int]("page_count", this)
val language = Column[Language]("language", this)
val classifyProposals = Column[MetaProposalList]("classify_proposals", this)
val all =
NonEmptyList.of[Column[_]](id, content, nerlabels, proposals, pages, language)
NonEmptyList.of[Column[_]](
id,
content,
nerlabels,
proposals,
pages,
language,
classifyProposals
)
}
val T = Table(None)
@ -52,7 +62,7 @@ object RAttachmentMeta {
DML.insert(
T,
T.all,
fr"${v.id},${v.content},${v.nerlabels},${v.proposals},${v.pages},${v.language}"
fr"${v.id},${v.content},${v.nerlabels},${v.proposals},${v.pages},${v.language},${v.classifyProposals}"
)
def exists(attachId: Ident): ConnectionIO[Boolean] =
@ -80,7 +90,8 @@ object RAttachmentMeta {
DML.set(
T.content.setTo(v.content),
T.nerlabels.setTo(v.nerlabels),
T.proposals.setTo(v.proposals)
T.proposals.setTo(v.proposals),
T.classifyProposals.setTo(v.classifyProposals)
)
)
@ -93,12 +104,17 @@ object RAttachmentMeta {
)
)
def updateProposals(mid: Ident, plist: MetaProposalList): ConnectionIO[Int] =
def updateProposals(
mid: Ident,
plist: MetaProposalList,
clist: Option[MetaProposalList]
): ConnectionIO[Int] =
DML.update(
T,
T.id === mid,
DML.set(
T.proposals.setTo(plist)
T.proposals.setTo(plist),
T.classifyProposals.setTo(clist)
)
)

2
modules/store/src/main/scala/docspell/store/records/RClassifierSetting.scala
View File

@ -20,7 +20,7 @@ case class RClassifierSetting(
listType: ListType
) {
def enabled: Boolean =
def autoTagEnabled: Boolean =
listType match {
case ListType.Blacklist =>
true