Sources/CapTrain.swift

@@ -23,9 +23,6 @@ struct CapTrain: AsyncParsableCommand {
     
     @Option(name: .shortAndLong, help: "The path to the folder where the content (images, classifier, thumbnails) is stored")
     var folder: String?
-    
-    @Flag(name: .long, help: "Only upload the previous classifier")
-    var skipTraining: Bool = false
 
     func run() async throws {
         let configurationFile = try configurationFile()
@@ -39,6 +36,7 @@ struct CapTrain: AsyncParsableCommand {
         guard let authentication = authentication ?? configurationFile?.authentication else {
             throw TrainingError.missingArguments("authentication")
         }
+        
         let configuration = Configuration(
             contentFolder: contentFolder,
             trainingIterations: iterations,
@@ -46,7 +44,7 @@ struct CapTrain: AsyncParsableCommand {
             authenticationToken: authentication)
         
         let creator = try ClassifierCreator(configuration: configuration, resume: resume)
-        try await creator.run(skipTraining: skipTraining)
+        try await creator.run()
     }
     
     private func configurationFile() throws -> ConfigurationFile? {

Sources/ClassifierCreator.swift

@@ -23,8 +23,6 @@ final class ClassifierCreator {
     
     let classifierUrl: URL
     
-    let urlSession = URLSession(configuration: .ephemeral)
-    
     let df = DateFormatter()
     
     private func print(info: String) {
@@ -61,7 +59,7 @@ final class ClassifierCreator {
     
     // MARK: Main function
     
-    func run(skipTraining: Bool) async throws {
+    func run() async throws {
         let imagesSnapshotDate = Date()
         let (classes, changedImageCount, changedMainImages) = try await loadImages()
 
@@ -80,16 +78,13 @@ final class ClassifierCreator {
         let classifierVersion = try await getClassifierVersion()
         let newVersion = classifierVersion + 1
 
-        print(info: "Server: \(server.path)")
         print(info: "Image directory: \(imageDirectory.absoluteURL.path)")
         print(info: "Model path: \(classifierUrl.path)")
         print(info: "Version: \(newVersion)")
         print(info: "Classes: \(classes.count)")
         print(info: "Iterations: \(configuration.trainingIterations)")
 
-        if !skipTraining {
+        try await trainAndSaveModel()
-            try await trainAndSaveModel()
-        }
         try await uploadModel(version: newVersion)
         try await upload(classes: classes, lastUpdate: imagesSnapshotDate)
         try await createThumbnails(changed: changedMainImages)
@@ -203,7 +198,7 @@ final class ClassifierCreator {
         let url = imageUrl(base: server.appendingPathComponent("images"), image: image)
         let tempFile: URL, response: URLResponse
         do {
-            (tempFile, response) = try await urlSession.download(from: url)
+            (tempFile, response) = try await URLSession.shared.download(from: url)
         } catch {
             throw TrainingError.failedToLoadImage(image, error)
         }
@@ -525,7 +520,7 @@ final class ClassifierCreator {
     }
     
     private func perform(_ request: URLRequest) async throws -> Data {
-        let (data, response) = try await urlSession.data(for: request)
+        let (data, response) = try await URLSession.shared.data(for: request)
         let code = (response as! HTTPURLResponse).statusCode
         guard code == 200 else {
             throw TrainingError.invalidResponse(request.url!, code)