Adds mediapipe_text package

.github/workflows/main.yaml

@@ -7,7 +7,7 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main, ffi-wrapper, ffi-wrapper-core-pkg]
+    branches: [main, ffi-wrapper, ffi-wrapper-text-pkg]
   workflow_dispatch:
   schedule:
     - cron: "0 0 * * *" # Every day at midnight
@@ -25,7 +25,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        flutter_version: [stable, beta, master]
+        flutter_version: [master]
+        # TODO(craiglabenz): reverse once CI works
+        # flutter_version: [stable, beta, master]
         # TODO(craiglabenz): Add `ubuntu-latest` and `windows-latest` when those artifacts exist
         os: [macos-latest]
     steps:

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "files.associations": {
+        "base_options.h": "c",
+        "__config": "c",
+        "text_classifier.h": "c",
+        "category.h": "c"
+    }
+}

Makefile

@@ -1,20 +1,34 @@
 # Runs the utility to pull in all header files from `google/mediapipe`
 headers:
-	cd packages/build_cmd && dart bin/main.dart headers
+	cd tool/builder && dart bin/main.dart headers
 
 # Runs `ffigen` for all packages
 generate: generate_core generate_text
 
-# Runs `ffigen` for all packages, compiles the faked C artifacts, and runs all tests
-test: generate_text test_text generate_core test_core
+# Runs `ffigen` for all packages and runs all tests
+test: generate_core test_core generate_text test_text
 
-# Runs `ffigen` for all packages and all tests for all packages
+# Runs all tests for all packages
 test_only: test_core test_text
 
+# Rebuilds the MediaPipe task for macOS
+# Assumes google/mediapipe and google/flutter-mediapipe are siblings on the file system
+compile_text_classifier_macos_arm:
+	cd ../mediapipe && bazel build --linkopt -s --config darwin_arm64 --strip always --define MEDIAPIPE_DISABLE_GPU=1 mediapipe/tasks/c/text/text_classifier:libtext_classifier.dylib
+	cd ../mediapipe && sudo cp bazel-bin/mediapipe/tasks/c/text/text_classifier/libtext_classifier.dylib ../flutter-mediapipe/packages/mediapipe-task-text/example/assets/libtext_classifier_arm64.dylib
+
+compile_text_classifier_macos_x86:
+	cd ../mediapipe && bazel build --linkopt -s --config darwin_x86_64 --strip always --define MEDIAPIPE_DISABLE_GPU=1 mediapipe/tasks/c/text/text_classifier:libtext_classifier.dylib
+	cd ../mediapipe && sudo cp bazel-bin/mediapipe/tasks/c/text/text_classifier/libtext_classifier.dylib ../flutter-mediapipe/packages/mediapipe-task-text/example/assets/libtext_classifier_x64.dylib
+
 # Runs `sdks_finder` to update manifest files
 sdks:
 	dart tool/builder/bin/main.dart sdks
 
+analyze:
+	cd packages/mediapipe-core && dart format -o write .
+	cd packages/mediapipe-task-text && dart format -o write .
+
 # Core ---
 
 # Runs `ffigen` for `mediapipe_core`
@@ -29,19 +43,12 @@ test_core:
 
 # Runs `ffigen` for `mediapipe_text`
 generate_text:
-	cd packages/mediapipe-task-text && dart run ffigen --config=ffigen.yaml
-
-# Compiles the faked C artifacts for testing
-compile_fake_text:
-	# Builds standalone executable
-	cd packages/mediapipe-task-text/test/c && gcc fake_text_classifier.c -o fake_text_classifier
-	# Builds what Flutter needs
-	cd packages/mediapipe-task-text/test/c && gcc -static -c -fPIC *.c -o fake_text_classifier.o
-	cd packages/mediapipe-task-text/test/c && gcc -shared -o fake_text_classifier.dylib fake_text_classifier.o 
-
-# Runs `ffigen` for `mediapipe_text` and all text tests
-test_text: compile_fake_text test_text_only
+	cd packages/mediapipe-task-text && dart --enable-experiment=native-assets run ffigen --config=ffigen.yaml
 
 # Runs all text tests
-test_text_only:
+test_text:
 	cd packages/mediapipe-task-text && flutter test
+	cd packages/mediapipe-task-text/example && flutter test
+
+example_text:
+	cd packages/mediapipe-task-text/example && flutter run -d macos

packages/mediapipe-core/README.md

@@ -24,4 +24,4 @@ Issues that are specific to Flutter can be filed in the [Flutter issue tracker](
 
 To contribute a change to this plugin,
 please review our [contribution guide](https://github.com/google/flutter-mediapipe/blob/master/CONTRIBUTING.md)
-and open a [pull request](https://github.com/google/flutter-mediapipe/pulls).
+and open a [pull request](https://github.com/google/flutter-mediapipe/pulls).

packages/mediapipe-core/analysis_options.yaml

@@ -1,5 +1,9 @@
 include: ../analysis_options.yaml
 
+linter:
+  rules:
+    - public_member_api_docs # see https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#documentation-dartdocs-javadocs-etc
+
 analyzer:
   exclude:
     - "**/mediapipe_common_bindings.dart"

packages/mediapipe-core/ffigen.yaml

@@ -1,13 +1,13 @@
 name: "MediaPipeCommonBindings"
 description: "Bindings for shared MediaPipe structs common across many tasks"
 output:
-  bindings: "lib/src/third_party/mediapipe/generated/mediapipe_common_bindings.dart"
+  bindings: "lib/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart"
   symbol-file:
     output: "package:mediapipe_core/generated/core_symbols.yaml"
-    import-path: "package:mediapipe_core/src/third_party/mediapipe/generated/mediapipe_common_bindings.dart"
+    import-path: "package:mediapipe_core/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart"
 headers:
   entry-points:
-    - "third_party/mediapipe/tasks/c/**"
+    - "third_party/mediapipe/tasks/c/**.h"
 preamble: |
   /* Copyright 2023 The MediaPipe Authors.
 

packages/mediapipe-core/lib/generated/core_symbols.yaml

@@ -1,11 +1,13 @@
 format_version: 1.0.0
 files:
-  package:mediapipe_core/src/third_party/mediapipe/generated/mediapipe_common_bindings.dart:
+  package:mediapipe_core/src/io/third_party/mediapipe/generated/mediapipe_common_bindings.dart:
     used-config:
       ffi-native: false
     symbols:
       c:@S@BaseOptions:
         name: BaseOptions
+      c:@S@Categories:
+        name: Categories
       c:@S@Category:
         name: Category
       c:@S@ClassificationResult:

packages/mediapipe-core/lib/interface.dart

@@ -0,0 +1,5 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export 'src/interface/interface.dart';

packages/mediapipe-core/lib/io.dart

@@ -0,0 +1,5 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+export 'src/io/mediapipe_core.dart';

packages/mediapipe-core/lib/mediapipe_core.dart

@@ -4,8 +4,9 @@
 
 /// Package containing core dependencies for MediaPipe's text, vision, and
 /// audio-based tasks.
-library;
+library mediapipe_core;
 
-export 'src/containers.dart' show Category, Classifications;
-export 'src/ffi_utils.dart';
-export 'src/task_options.dart' show BaseOptions, ClassifierOptions;
+export 'src/extensions.dart';
+export 'universal_mediapipe_core.dart'
+    if (dart.library.html) 'src/web/mediapipe_core.dart'
+    if (dart.library.io) 'src/io/mediapipe_core.dart';

packages/mediapipe-core/lib/src/extensions.dart

@@ -0,0 +1,14 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// Shortens long strings for logging, printing, etc.
+extension DebuggableString on String {
+  /// Shortens the string to its first X characters, replacing the rest with an
+  /// ellipses and the total length. If the string is equal to or shorter than
+  /// the given length, then [shorten] is a no-op.
+  String shorten([int x = 10]) {
+    if (length <= x) return this;
+    return '${substring(0, x)}...[$length]';
+  }
+}