ch/Caps-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Separate classes to file

Browse Source
This commit is contained in:
Christoph Hagen
2023-03-20 15:25:58 +01:00
parent 289e927c6a
commit 3ed5f0e0ff
4 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/App/Cap.swift
View File

@ -10,9 +10,6 @@ struct Cap: Codable {
var mainImage: Int
/// The version of the first classifier trained on this cap
var classifierVersion: Int?
var color: Color?
enum CodingKeys: String, CodingKey {
@ -20,7 +17,6 @@ struct Cap: Codable {
case name = "n"
case count = "c"
case mainImage = "m"
case classifierVersion = "v"
case color = "f"
}

2
Sources/App/CapServer+Routes.swift
View File

@ -79,7 +79,7 @@ extension CapServer {
try authenticator.authorize(request)
let body = try request.getStringBody(request: "/classes/:date")
self.updateTrainedClasses(content: body)
try self.saveTrainedClasses(content: body)
self.removeAllEntriesInImageChangeList(before: date)
}

39
Sources/App/CapServer.swift
View File

@ -23,6 +23,8 @@ final class CapServer {
private let classifierFile: URL
private let classifierClassesFile: URL
private let changedImagesFile: URL
private let fm = FileManager.default
@ -87,6 +89,7 @@ final class CapServer {
self.htmlFile = folder.appendingPathComponent("count.html")
self.classifierVersionFile = folder.appendingPathComponent("classifier.version")
self.classifierFile = folder.appendingPathComponent("classifier.mlmodel")
self.classifierClassesFile = folder.appendingPathComponent("classifier.classes")
self.changedImagesFile = folder.appendingPathComponent("changes.txt")
self.changedImageEntryDateFormatter = DateFormatter()
changedImageEntryDateFormatter.dateFormat = "yy-MM-dd-HH-mm-ss"
@ -465,7 +468,6 @@ final class CapServer {
}
var cap = cap
cap.count = 0
cap.classifierVersion = nil
caps[cap.id] = cap
saveCapCountHTML()
updateGridCapCount()
@ -537,18 +539,33 @@ final class CapServer {
// MARK: Classifier
func updateTrainedClasses(content: String) {
let trainedCaps = content
.components(separatedBy: "\n")
.compactMap(Int.init)
let version = classifierVersion
for cap in trainedCaps {
// Set current classifier
if caps[cap]?.classifierVersion == nil {
caps[cap]?.classifierVersion = version
func saveTrainedClasses(content: String) throws {
let classes = content.components(separatedBy: ",")
// Validate input
try classes.forEach { s in
guard let id = Int(s) else {
log("Invalid id '\(s)' in uploaded id list")
throw Abort(.badRequest)
}
guard caps[id] != nil else {
log("Unknown id '\(id)' in uploaded id list")
throw Abort(.badRequest)
}
}
log("Updated \(trainedCaps.count) classifier classes")
guard let data = content.data(using: .utf8) else {
log("Failed to get classes data for writing")
throw Abort(.internalServerError)
}
do {
try data.write(to: classifierClassesFile)
log("Updated \(classes.count) classifier classes")
} catch {
log("Failed to write classifier classes: \(error)")
throw Abort(.internalServerError)
}
}
func save(classifier: Data, version: Int) throws {