Allow import of models without project.json

Author: RHeckerIntel

lib/importers/geti_deployment.dart

@@ -10,6 +10,7 @@ import 'package:archive/archive_io.dart';
 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 @@ class GetiDeploymentProcessor extends Importer {
       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

@@ -33,6 +33,8 @@ class ModelDirImporter extends Importer {
     return project!;
   }
 
+  bool get containsProjectJson => findProjectJsonFile() != null;
+
   String? findProjectJsonFile() {
     final files = Directory(directory).listSync();
     return files.firstWhereOrNull((file) => basename(file.path) == "project.json")?.path;

lib/pages/import/widgets/directory_import.dart

@@ -9,10 +9,15 @@ import 'package:file_picker/file_picker.dart';
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:inference/importers/model_directory_importer.dart';
+import 'package:inference/importers/model_manifest.dart';
+import 'package:inference/project.dart';
 import 'package:inference/providers/project_provider.dart';
+import 'package:inference/public_models.dart';
 import 'package:inference/theme_fluent.dart';
+import 'package:inference/utils.dart';
 import 'package:path/path.dart' show dirname;
 import 'package:provider/provider.dart';
+import 'package:uuid/uuid.dart';
 
 class DirectoryImport extends StatefulWidget {
   const DirectoryImport({super.key});
@@ -23,6 +28,7 @@ class DirectoryImport extends StatefulWidget {
 
 class _DirectoryImportState extends State<DirectoryImport> {
   bool _showReleaseMessage = false;
+  String? selectedFolder;
 
   void showReleaseMessage() {
     setState(() => _showReleaseMessage = true);
@@ -43,7 +49,25 @@ class _DirectoryImportState extends State<DirectoryImport> {
 
   Future<void> processFolder(String directory) async {
     final importer = ModelDirImporter(directory);
-    final project = await importer.generateProject();
+    if (importer.containsProjectJson) {
+      final project = await importer.generateProject();
+      importer.setupFiles();
+      if (mounted) {
+        final projectsProvider = Provider.of<ProjectProvider>(context, listen: false);
+        projectsProvider.addProject(project);
+        Navigator.pop(context, [project]);
+      }
+    } else {
+      setState(() {
+        selectedFolder = directory;
+      });
+    }
+  }
+
+  Future<void> importProject(Project project) async {
+    final importer = ModelDirImporter(project.storagePath);
+    importer.project = project;
+    writeProjectJson(project);
     importer.setupFiles();
     if (mounted) {
       final projectsProvider = Provider.of<ProjectProvider>(context, listen: false);
@@ -78,31 +102,153 @@ class _DirectoryImportState extends State<DirectoryImport> {
             },
             onDragExited: (val) => hideReleaseMessage(),
             onDragEntered: (val) => showReleaseMessage(),
+            child: Builder(
+              builder: (context) {
+                if (selectedFolder != null && !_showReleaseMessage) {
+                  return ModelImportPropertiesForm(
+                    storagePath: selectedFolder!,
+                    onProjectImport: importProject,
+                    onCancel: () {
+                      setState(() => selectedFolder = null);
+                    },
+                  );
+                }
+                return Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Text(text,
+                      style: const TextStyle(
+                        fontSize: 28,
+                      )
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.all(24),
+                      child: SvgPicture.asset('images/drop_geti.svg'),
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.only(top: 24),
+                      child: FilledButton(
+                        onPressed: () => selectFolder(),
+                        child: const Text("Select folder"),
+                      ),
+                    )
+                  ],
+                );
+              }
+            ),
+          );
+        }
+      )
+    );
+  }
+}
+
+class ModelImportPropertiesForm extends StatefulWidget {
+  final String storagePath;
+  final Function? onCancel;
+  final Function(Project)? onProjectImport;
+  const ModelImportPropertiesForm({
+    super.key,
+    required this.storagePath,
+    this.onProjectImport,
+    this.onCancel,
+  });
+
+  @override
+  State<ModelImportPropertiesForm> createState() => _ModelImportPropertiesFormState();
+}
+
+class _ModelImportPropertiesFormState extends State<ModelImportPropertiesForm> {
+  ProjectType projectType = ProjectType.text;
+  final TextEditingController _controller = TextEditingController();
+
+  void generateModelManifest() async {
+    final name = _controller.text;
+    final manifest = ModelManifest(
+      name: name,
+      id: const Uuid().v4().toString(),
+      fileSize: calculateDiskUsage(widget.storagePath),
+      task: projectTypeToString(projectType),
+      author: "Unknown",
+      collection: "",
+      description: "Try out $name",
+      npuEnabled: false,
+      contextWindow: 0,
+      optimizationPrecision: "",
+    );
+
+    widget.onProjectImport?.call(await PublicProject.fromModelManifest(manifest, widget.storagePath));
+  }
+
+  bool get validForm => _controller.text.isNotEmpty;
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(20),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(
             child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(text,
-                  style: const TextStyle(
-                    fontSize: 28,
+                const SizedBox(height: 10),
+                InfoLabel(
+                  label: "Model name",
+                  child: TextBox(
+                    placeholder:  "Name",
+                    controller: _controller,
+                    onChanged: (_) => setState(() {}),
                   )
                 ),
-                Padding(
-                  padding: const EdgeInsets.all(24),
-                  child: SvgPicture.asset('images/drop_geti.svg'),
+                const SizedBox(height: 10),
+                InfoLabel(
+                  label: "Task",
+                  child: ComboBox<ProjectType>(
+                    value: projectType,
+                    items: List<ComboBoxItem<ProjectType>>.from([
+                        ProjectType.text,
+                        ProjectType.vlm,
+                        ProjectType.textToImage,
+                        ProjectType.speech,
+                      ].map((t) {
+                      return ComboBoxItem<ProjectType>(
+                        value: t,
+                        child: Text(projectTypeToName(t)),
+                      );
+                    })),
+                    placeholder: const Text("Select model task"),
+                    onChanged: (t) => setState(() => projectType = t!),
+                  )
                 ),
-                Padding(
-                  padding: const EdgeInsets.only(top: 24),
-                  child: FilledButton(
-                    onPressed: () => selectFolder(),
-                    child: const Text("Select folder"),
-                  ),
-                )
               ],
             ),
-          );
-        }
-      )
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              Button(
+                onPressed: () => widget.onCancel?.call(),
+                child: const Text("Cancel"),
+              ),
+              const SizedBox(width: 10),
+              FilledButton(
+                onPressed: validForm ? () => generateModelManifest() : null,
+                child: const Text("Import"),
+              ),
+            ],
+          )
+
+        ],
+      ),
     );
   }
 }

lib/pages/import/widgets/import_model_dialog.dart

@@ -48,7 +48,7 @@ class _ImportModelDialogState extends State<ImportModelDialog> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                const Text('Import model from your local disk'),
+                const Text('Import model from your local disk', style: TextStyle(fontSize: 20)),
                 IconButton(
                   icon: const Icon(FluentIcons.clear),
                   onPressed: () { Navigator.pop(context, List<Project>.from([])); },
@@ -66,12 +66,12 @@ class _ImportModelDialogState extends State<ImportModelDialog> {
                   displayMode: PaneDisplayMode.top,
                     items: [
                       PaneItem(
-                        icon: Icon(FluentIcons.car),
+                        icon: Icon(FluentIcons.add_to),
                         title: const Text("Geti"),
                         body: GetiImport(),
                       ),
                       PaneItem(
-                        icon: Icon(FluentIcons.car),
+                        icon: Icon(FluentIcons.fabric_folder_upload),
                         title: const Text("Directory"),
                         body: DirectoryImport(),
                       ),

lib/project.dart

@@ -7,6 +7,7 @@ import 'dart:io';
 
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:inference/importers/model_manifest.dart';
+import 'package:inference/utils.dart';
 import 'package:inference/utils/get_public_thumbnail.dart';
 import 'package:path/path.dart';
 import 'package:collection/collection.dart';
@@ -147,6 +148,21 @@ String projectTypeToString(ProjectType type) {
   }
 }
 
+String projectTypeToName(ProjectType type) {
+  switch(type){
+    case ProjectType.text:
+      return "Text Generation";
+    case ProjectType.textToImage:
+      return "Image generation";
+    case ProjectType.vlm:
+      return "VLM";
+    case ProjectType.image:
+      return "Computer Vision";
+    case ProjectType.speech:
+      return "Transcription";
+  }
+}
+
 class Project {
   String id;
   String modelId;
@@ -217,15 +233,7 @@ class GetiProject extends Project {
 
   GetiProject(String id, String modelId, String applicationVersion, String name, String creationTime, ProjectType type, String storagePath)
     : super(id, modelId, applicationVersion, name, creationTime, type, storagePath, false) {
-    size = calculateDiskUsage();
-  }
-
-  int calculateDiskUsage() {
-    final dir = Directory(storagePath);
-    if (dir.existsSync()) {
-      return dir.listSync(recursive: true).fold(0, (acc, m) => acc + m.statSync().size);
-    }
-    return 0;
+    size = calculateDiskUsage(storagePath);
   }
 
   List<Score?> scores() {
@@ -347,7 +355,7 @@ class PublicProject extends Project {
   }
 
   Image get thumbnail {
-    return getThumbnail(modelId);
+    return getThumbnail(name);
   }
 
   @override
@@ -368,11 +376,16 @@ class PublicProject extends Project {
   @override
   bool get isDownloaded => loaded.isCompleted;
 
-  static Future<PublicProject> fromModelManifest(ModelManifest manifest) async {
+  static Future<PublicProject> fromModelManifest(ModelManifest manifest, [String? path]) async {
     final directory = await getApplicationSupportDirectory();
     final projectId = manifest.id;
-    final storagePath = platformContext.join(directory.path, projectId.toString());
-    await Directory(storagePath).create(recursive: true);
+    String storagePath;
+    if (path == null) {
+      storagePath = platformContext.join(directory.path, projectId.toString());
+      await Directory(storagePath).create(recursive: true);
+    } else {
+      storagePath = path;
+    }
     final projectType = parseProjectType(manifest.task);
 
     return PublicProject(

lib/public_models.dart

@@ -19,7 +19,7 @@ void createDirectory(PublicProject project) {
   Directory(project.storagePath).createSync();
 }
 
-void writeProjectJson(PublicProject project) {
+void writeProjectJson(Project project) {
   final projectFile = platformContext.join(project.storagePath, "project.json");
   const encoder = JsonEncoder.withIndent("  ");
   File(projectFile).writeAsStringSync(encoder.convert((project.toMap())));

lib/utils.dart

@@ -126,3 +126,11 @@ class Envvars {
     return '';
   }
 }
+
+int calculateDiskUsage(path) {
+  final dir = Directory(path);
+  if (dir.existsSync()) {
+    return dir.listSync(recursive: true).fold(0, (acc, m) => acc + m.statSync().size);
+  }
+  return 0;
+}