Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 235ae61

Browse files
samtsternsamtstern
committed
MLKit breaking changes
Change-Id: Id62245a0bb7d56a1c8909eee1a3c298516756b42
1 parent aa66c4f commit 235ae61

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

‎mlkit/app/src/main/java/com/google/firebase/example/mlkit/CustomModelActivity.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import com.google.android.gms.tasks.OnFailureListener;
1111
import com.google.android.gms.tasks.OnSuccessListener;
1212
import com.google.firebase.ml.common.FirebaseMLException;
13-
import com.google.firebase.ml.common.modeldownload.FirebaseCloudModelSource;
14-
import com.google.firebase.ml.common.modeldownload.FirebaseLocalModelSource;
13+
import com.google.firebase.ml.common.modeldownload.FirebaseLocalModel;
1514
import com.google.firebase.ml.common.modeldownload.FirebaseModelDownloadConditions;
1615
import com.google.firebase.ml.common.modeldownload.FirebaseModelManager;
16+
import com.google.firebase.ml.common.modeldownload.FirebaseRemoteModel;
1717
import com.google.firebase.ml.custom.FirebaseModelDataType;
1818
import com.google.firebase.ml.custom.FirebaseModelInputOutputOptions;
1919
import com.google.firebase.ml.custom.FirebaseModelInputs;
@@ -39,31 +39,31 @@ private void configureHostedModelSource() {
3939
}
4040
FirebaseModelDownloadConditions conditions = conditionsBuilder.build();
4141

42-
// Build a FirebaseCloudModelSource object by specifying the name you assigned the model
42+
// Build a remote model source object by specifying the name you assigned the model
4343
// when you uploaded it in the Firebase console.
44-
FirebaseCloudModelSource cloudSource = new FirebaseCloudModelSource.Builder("my_cloud_model")
44+
FirebaseRemoteModel cloudSource = new FirebaseRemoteModel.Builder("my_cloud_model")
4545
.enableModelUpdates(true)
4646
.setInitialDownloadConditions(conditions)
4747
.setUpdatesDownloadConditions(conditions)
4848
.build();
49-
FirebaseModelManager.getInstance().registerCloudModelSource(cloudSource);
49+
FirebaseModelManager.getInstance().registerRemoteModel(cloudSource);
5050
// [END mlkit_cloud_model_source]
5151
}
5252

5353
private void configureLocalModelSource() {
5454
// [START mlkit_local_model_source]
55-
FirebaseLocalModelSource localSource =
56-
new FirebaseLocalModelSource.Builder("my_local_model") // Assign a name to this model
55+
FirebaseLocalModel localSource =
56+
new FirebaseLocalModel.Builder("my_local_model") // Assign a name to this model
5757
.setAssetFilePath("my_model.tflite")
5858
.build();
59-
FirebaseModelManager.getInstance().registerLocalModelSource(localSource);
59+
FirebaseModelManager.getInstance().registerLocalModel(localSource);
6060
// [END mlkit_local_model_source]
6161
}
6262

6363
private FirebaseModelInterpreter createInterpreter() throws FirebaseMLException {
6464
// [START mlkit_create_interpreter]
6565
FirebaseModelOptions options = new FirebaseModelOptions.Builder()
66-
.setCloudModelName("my_cloud_model")
66+
.setRemoteModelName("my_cloud_model")
6767
.setLocalModelName("my_local_model")
6868
.build();
6969
FirebaseModelInterpreter firebaseInterpreter =

‎mlkit/app/src/main/java/com/google/firebase/example/mlkit/kotlin/CustomModelActivity.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import android.support.v7.app.AppCompatActivity
99
import android.util.Log
1010
import com.google.android.gms.tasks.OnFailureListener
1111
import com.google.firebase.ml.common.FirebaseMLException
12-
import com.google.firebase.ml.common.modeldownload.FirebaseCloudModelSource
13-
import com.google.firebase.ml.common.modeldownload.FirebaseLocalModelSource
12+
import com.google.firebase.ml.common.modeldownload.FirebaseLocalModel
1413
import com.google.firebase.ml.common.modeldownload.FirebaseModelDownloadConditions
1514
import com.google.firebase.ml.common.modeldownload.FirebaseModelManager
15+
import com.google.firebase.ml.common.modeldownload.FirebaseRemoteModel
1616
import com.google.firebase.ml.custom.FirebaseModelDataType
1717
import com.google.firebase.ml.custom.FirebaseModelInputOutputOptions
1818
import com.google.firebase.ml.custom.FirebaseModelInputs
@@ -42,31 +42,31 @@ class CustomModelActivity : AppCompatActivity() {
4242
}
4343
val conditions = conditionsBuilder.build()
4444

45-
// Build a FirebaseCloudModelSource object by specifying the name you assigned the model
45+
// Build a remote model object by specifying the name you assigned the model
4646
// when you uploaded it in the Firebase console.
47-
val cloudSource = FirebaseCloudModelSource.Builder("my_cloud_model")
47+
val cloudSource = FirebaseRemoteModel.Builder("my_cloud_model")
4848
.enableModelUpdates(true)
4949
.setInitialDownloadConditions(conditions)
5050
.setUpdatesDownloadConditions(conditions)
5151
.build()
52-
FirebaseModelManager.getInstance().registerCloudModelSource(cloudSource)
52+
FirebaseModelManager.getInstance().registerRemoteModel(cloudSource)
5353
// [END mlkit_cloud_model_source]
5454
}
5555

5656
private fun configureLocalModelSource() {
5757
// [START mlkit_local_model_source]
58-
val localSource = FirebaseLocalModelSource.Builder("my_local_model") // Assign a name to this model
58+
val localSource = FirebaseLocalModel.Builder("my_local_model") // Assign a name to this model
5959
.setAssetFilePath("my_model.tflite")
6060
.build()
61-
FirebaseModelManager.getInstance().registerLocalModelSource(localSource)
61+
FirebaseModelManager.getInstance().registerLocalModel(localSource)
6262
// [END mlkit_local_model_source]
6363
}
6464

6565
@Throws(FirebaseMLException::class)
6666
private fun createInterpreter(): FirebaseModelInterpreter? {
6767
// [START mlkit_create_interpreter]
6868
val options = FirebaseModelOptions.Builder()
69-
.setCloudModelName("my_cloud_model")
69+
.setRemoteModelName("my_cloud_model")
7070
.setLocalModelName("my_local_model")
7171
.build()
7272
val interpreter = FirebaseModelInterpreter.getInstance(options)

0 commit comments

Comments
 (0)