Project Import

lib/config.dart

@@ -20,39 +20,57 @@
 }
 
 class Config {
-  static Hints hints = Hints();
-  static String _proxy = '';
-  static bool _proxyEnabled = false;
-  static ThemeMode _mode = ThemeMode.system;
-  static Envvars envvars = Envvars();
-
-  static String get proxy => _proxy;
-  static setProxy(String value) async {
+  static final Config _instance = Config._internal();
+  Config._internal();
+
+  factory Config () {
+    return _instance;
+  }
+
+  final List<String> _externalModels = [];
+  List<String> get externalModels => _externalModels;
+  addExternalModel(String path) async {
+    _externalModels.add(path);
+    await _save('externalModels', _externalModels);
+  }
+  removeExternalModel(String path) async {
+    _externalModels.remove(path);
+    await _save('externalModels', _externalModels);
+  }
+
+  Hints hints = Hints();
+  String _proxy = '';
+  bool _proxyEnabled = false;
+  ThemeMode _mode = ThemeMode.system;
+  Envvars envvars = Envvars();
+
+  String get proxy => _proxy;
+  setProxy(String value) async {
     _proxy = value;
     await _save('proxy', value);
   }
 
-  static bool get proxyEnabled => _proxyEnabled;
-  static setProxyEnabled(bool value) async {
+  bool get proxyEnabled => _proxyEnabled;
+  setProxyEnabled(bool value) async {
     _proxyEnabled = value;
     await _save('proxyEnabled', value);
   }
 
-  static ThemeMode get themeMode => _mode;
-  static setThemeMode(ThemeMode value) async {
+  ThemeMode get themeMode => _mode;
+  setThemeMode(ThemeMode value) async {
     _mode = value;
     await _save('mode', value.index);
   }
 
-  static void reset() {
+  void reset() {
     hints = Hints();
     _proxy = '';
     _proxyEnabled = false;
     _mode = ThemeMode.system;
     envvars = Envvars();
   }
 
-  static Future<String> _getProxy() async {
+  Future<String> _getProxy() async {
     final dio = Dio(BaseOptions(connectTimeout: const Duration(seconds: 10)));
     dio.httpClientAdapter = IOHttpClientAdapter(
       createHttpClient: () {
@@ -79,7 +97,7 @@
     return '';
   }
 
-  static Future<void> loadFromFile() async {
+  Future<void> loadFromFile() async {
     final directory = await getApplicationSupportDirectory();
     final file = File('${directory.path}/config.json');
     if (await file.exists()) {
@@ -92,10 +110,11 @@
         _proxy = await _getProxy();
       }
       _mode = ThemeMode.values[json['mode'] ?? 0];
+      _externalModels.addAll(List<String>.from(json['externalModels'] ?? []));
     }
   }
 
-  static Future<void> _save(String key, dynamic value) async {
+  Future<void> _save(String key, dynamic value) async {
     final directory = await getApplicationSupportDirectory();
     final file = File('${directory.path}/config.json');
     Map<String, dynamic> json = {};
@@ -104,7 +123,8 @@
       json = jsonDecode(contents);
     }
     json[key] = value;
-    await file.writeAsString(jsonEncode(json));
+    const encoder = JsonEncoder.withIndent("  ");
+    await file.writeAsString(encoder.convert(json));
   }
 
 }

lib/deployment_processor.dart

@@ -5,9 +5,9 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:flutter/services.dart';
+import 'package:inference/config.dart';
 import 'package:inference/importers/manifest_importer.dart';
 import 'package:inference/migration/migration_manager.dart';
-import 'package:inference/migration/migrations/migration_1.0.0_to_25.0.1.dart';
 import 'package:inference/project.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart';
@@ -35,31 +35,32 @@
   final directory = await getApplicationSupportDirectory();
   final manifest = ManifestImporter("assets/manifest.json");
   await manifest.loadManifest();
-  final migrationManager = MigrationManager(
+  final migrationManager = MigrationManager.withMigrations(
     destinationVersion: currentApplicationVersion,
     manifest: manifest.allModels,
-    migrations: [
-      MigrationV1ToV2501(),
-    ]
   );
 
-  return List.from(directory.listSync()
+  final modelPaths = [
+    Config().externalModels,
+    directory.listSync().map((m) => m.path),
+  ].expand((l) => l);
+
+  return List.from(modelPaths
     .map((projectFolder) {
-      if (!Directory(projectFolder.path).existsSync()) {
+      if (!Directory(projectFolder).existsSync()) {
         return null;
       }
       final platformContext = Context(style: Style.platform);
       try {
-        final projectFile = File(platformContext.join(projectFolder.path, "project.json"));
+        final projectFile = File(platformContext.join(projectFolder, "project.json"));
         final content = projectFile.readAsStringSync();
         var jsonContent = jsonDecode(content);
         if (migrationManager.eligible((jsonContent))) {
-          print("Migrating ${projectFolder.path}");
           jsonContent = migrationManager.migrate(jsonContent);
           const encoder = JsonEncoder.withIndent("  ");
           projectFile.writeAsStringSync(encoder.convert(jsonContent));
         }
-        final project = Project.fromJson(jsonContent, projectFolder.path);
+        final project = Project.fromJson(jsonContent, projectFolder);
         project.loaded.complete();
         return project;
       } catch (exception, stack) {

lib/importers/geti_deployment.dart

@@ -10,6 +10,7 @@
 import 'package:inference/interop/utils.dart';
 import 'package:inference/importers/importer.dart';
 import 'package:inference/project.dart';
+import 'package:inference/utils.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:uuid/uuid.dart';
@@ -63,7 +64,7 @@
       await processTask(task);
     }
     const encoder = JsonEncoder.withIndent("  ");
-    project!.size = project!.calculateDiskUsage();
+    project!.size = calculateDiskUsage(project!.storagePath);
     File(platformContext.join(project!.storagePath, "project.json"))
         .writeAsString(encoder.convert(project!.toMap()));
     project!.loaded.complete();

lib/importers/model_directory_importer.dart

@@ -0,0 +1,60 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:inference/config.dart';
+import 'package:inference/importers/importer.dart';
+import 'package:inference/migration/migration_manager.dart';
+import 'package:inference/project.dart';
+import 'package:path/path.dart';
+
+class ModelDirImporter extends Importer {
+  final String directory;
+  Project? project;
+
+  ModelDirImporter(this.directory);
+
+  @override
+  Future<Project> generateProject() async {
+    final projectJson = findProjectJsonFile();
+    if (projectJson == null) {
+      throw Exception("no project json in file");
+    } else {
+      final migrationManager = MigrationManager.withMigrations(
+        destinationVersion: currentApplicationVersion,
+        manifest: [],
+      );
+
+      final source = File(projectJson).readAsStringSync();
+      final migrated = migrationManager.migrate(jsonDecode(source));
+      project =  Project.fromJson(migrated, directory);
+    }
+    return project!;
+  }
+
+  bool get containsProjectJson => findProjectJsonFile() != null;
+
+  String? findProjectJsonFile() {
+    final files = Directory(directory).listSync();
+    return files.firstWhereOrNull((file) => basename(file.path) == "project.json")?.path;
+  }
+
+  @override
+  bool match() {
+    return findProjectJsonFile() != null;
+  }
+
+  @override
+  Future<void> setupFiles() async {
+
+    await Config().addExternalModel(project!.storagePath);
+    project!.loaded.complete();
+    return;
+  }
+
+  @override
+  Future<bool> askUser(BuildContext context) async {
+    return true;
+  }
+}

lib/main.dart

@@ -21,7 +21,7 @@
   WidgetsFlutterBinding.ensureInitialized();
   await windowManager.ensureInitialized();
   await ObjectBox.create();
-  await Config.loadFromFile();
+  await Config().loadFromFile();
   WindowOptions windowOptions = WindowOptions(
     size: const Size(1400, 1024),
     center: true,

lib/migration/migration_manager.dart

@@ -5,6 +5,7 @@
 import 'package:collection/collection.dart';
 import 'package:inference/importers/model_manifest.dart';
 import 'package:inference/migration/migration.dart';
+import 'package:inference/migration/migrations/migration_1.0.0_to_25.0.1.dart';
 
 class MigrationManager {
   final String destinationVersion;
@@ -17,6 +18,19 @@ class MigrationManager {
       required this.migrations,
   });
 
+  factory MigrationManager.withMigrations({
+      required String destinationVersion,
+      required List<ModelManifest> manifest,
+  }) {
+    return MigrationManager(
+        destinationVersion: destinationVersion,
+        manifest: manifest,
+        migrations: [
+          MigrationV1ToV2501(),
+        ]
+    );
+  }
+
   bool eligible(Map<String, dynamic> json) {
     return migrations.firstWhereOrNull((migration) {
       return migration.from == json["application_version"];

lib/pages/import/import.dart

@@ -7,7 +7,7 @@
 import 'package:go_router/go_router.dart';
 import 'package:inference/pages/import/huggingface.dart';
 import 'package:inference/pages/import/providers/import_provider.dart';
-import 'package:inference/pages/import/widgets/import_geti_model_dialog.dart';
+import 'package:inference/pages/import/widgets/import_model_dialog.dart';
 import 'package:inference/project.dart';
 import 'package:inference/providers/project_filter_provider.dart';
 import 'package:inference/theme_fluent.dart';
@@ -67,7 +67,7 @@
                   PaneItemAction(
                     icon: const Icon(FluentIcons.project_collection),
                     title: const Text("Local disk"),
-                    onTap: () => showImportGetiModelDialog(context,
+                    onTap: () => showImportModelDialog(context,
                       callback: (projects) {
                         if (projects != null && projects.isNotEmpty) {
                           if (projects.length == 1) {