Skip to content

Commit efeb387

Browse files
committed
update the test internal constructor and add more annotations
1 parent 9ee100f commit efeb387

File tree

4 files changed

+53
-27
lines changed

4 files changed

+53
-27
lines changed

packages/firebase_ai/firebase_ai/lib/src/imagen/imagen_model.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ final class ImagenModel extends BaseApiClientModel {
3939
_safetySettings = safetySettings,
4040
_useVertexBackend = useVertexBackend,
4141
super(
42-
serializationStrategy: VertexSerialization(),
42+
serializationStrategy: useVertexBackend
43+
? VertexSerialization()
44+
: DeveloperSerialization(),
4345
modelUri: useVertexBackend
4446
? _VertexUri(app: app, model: model, location: location)
4547
: _GoogleAIUri(app: app, model: model),

packages/firebase_ai/firebase_ai/lib/src/server_template/template_generative_model.dart

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,10 @@ part of '../base_model.dart';
1818
/// A generative model that connects to a remote server template.
1919
@experimental
2020
final class TemplateGenerativeModel extends BaseTemplateApiClientModel {
21-
/// Constructor only for test usage
22-
@internal
23-
TemplateGenerativeModel.internal({
21+
TemplateGenerativeModel._test({
2422
required String location,
2523
required FirebaseApp app,
2624
required bool useVertexBackend,
27-
bool? useLimitedUseAppCheckTokens,
28-
FirebaseAppCheck? appCheck,
29-
FirebaseAuth? auth,
3025
http.Client? httpClient,
3126
}) : super(
3227
serializationStrategy: useVertexBackend
@@ -38,8 +33,7 @@ final class TemplateGenerativeModel extends BaseTemplateApiClientModel {
3833
client: HttpApiClient(
3934
apiKey: app.options.apiKey,
4035
httpClient: httpClient,
41-
requestHeaders: BaseModel.firebaseTokens(
42-
appCheck, auth, app, useLimitedUseAppCheckTokens)),
36+
requestHeaders: BaseModel.firebaseTokens(null, null, app, false)),
4337
templateUri: useVertexBackend
4438
? _TemplateVertexUri(app: app, location: location)
4539
: _TemplateGoogleAIUri(app: app),
@@ -97,6 +91,7 @@ final class TemplateGenerativeModel extends BaseTemplateApiClientModel {
9791

9892
/// Returns a [TemplateGenerativeModel] using its private constructor.
9993
@experimental
94+
@internal
10095
TemplateGenerativeModel createTemplateGenerativeModel({
10196
required FirebaseApp app,
10297
required String location,
@@ -113,3 +108,19 @@ TemplateGenerativeModel createTemplateGenerativeModel({
113108
auth: auth,
114109
location: location,
115110
);
111+
112+
/// Returns a [TemplateGenerativeModel] for test case.
113+
@experimental
114+
@internal
115+
TemplateGenerativeModel createTestTemplateGenerativeModel({
116+
required FirebaseApp app,
117+
required String location,
118+
required bool useVertexBackend,
119+
required http.Client client,
120+
}) =>
121+
TemplateGenerativeModel._test(
122+
app: app,
123+
useVertexBackend: useVertexBackend,
124+
location: location,
125+
httpClient: client,
126+
);

packages/firebase_ai/firebase_ai/lib/src/server_template/template_imagen_model.dart

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,10 @@ part of '../base_model.dart';
1717
/// An image model that connects to a remote server template.
1818
@experimental
1919
final class TemplateImagenModel extends BaseTemplateApiClientModel {
20-
/// Constructor only for test usage
21-
@internal
22-
TemplateImagenModel.internal(
20+
TemplateImagenModel._testModel(
2321
{required FirebaseApp app,
2422
required String location,
2523
required bool useVertexBackend,
26-
bool? useLimitedUseAppCheckTokens,
27-
FirebaseAppCheck? appCheck,
28-
FirebaseAuth? auth,
2924
http.Client? httpClient})
3025
: super(
3126
serializationStrategy: VertexSerialization(),
@@ -35,8 +30,7 @@ final class TemplateImagenModel extends BaseTemplateApiClientModel {
3530
client: HttpApiClient(
3631
apiKey: app.options.apiKey,
3732
httpClient: httpClient,
38-
requestHeaders: BaseModel.firebaseTokens(
39-
appCheck, auth, app, useLimitedUseAppCheckTokens)),
33+
requestHeaders: BaseModel.firebaseTokens(null, null, app, false)),
4034
templateUri: useVertexBackend
4135
? _TemplateVertexUri(app: app, location: location)
4236
: _TemplateGoogleAIUri(app: app),
@@ -50,7 +44,9 @@ final class TemplateImagenModel extends BaseTemplateApiClientModel {
5044
FirebaseAppCheck? appCheck,
5145
FirebaseAuth? auth})
5246
: super(
53-
serializationStrategy: VertexSerialization(),
47+
serializationStrategy: useVertexBackend
48+
? VertexSerialization()
49+
: DeveloperSerialization(),
5450
modelUri: useVertexBackend
5551
? _VertexUri(app: app, model: '', location: location)
5652
: _GoogleAIUri(app: app, model: ''),
@@ -78,8 +74,9 @@ final class TemplateImagenModel extends BaseTemplateApiClientModel {
7874
);
7975
}
8076

81-
/// Returns a [TemplateImagenModel] using it's private constructor.
77+
/// Returns a [TemplateImagenModel] using its private constructor.
8278
@experimental
79+
@internal
8380
TemplateImagenModel createTemplateImagenModel({
8481
required FirebaseApp app,
8582
required String location,
@@ -96,3 +93,19 @@ TemplateImagenModel createTemplateImagenModel({
9693
useVertexBackend: useVertexBackend,
9794
useLimitedUseAppCheckTokens: useLimitedUseAppCheckTokens,
9895
);
96+
97+
/// Returns a [TemplateImagenModel] using its private constructor.
98+
@experimental
99+
@internal
100+
TemplateImagenModel createTestTemplateImagenModel({
101+
required FirebaseApp app,
102+
required String location,
103+
required bool useVertexBackend,
104+
required http.Client client,
105+
}) =>
106+
TemplateImagenModel._testModel(
107+
app: app,
108+
location: location,
109+
useVertexBackend: useVertexBackend,
110+
httpClient: client,
111+
);

packages/firebase_ai/firebase_ai/test/server_template_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import 'dart:convert';
1616

1717
import 'package:firebase_ai/firebase_ai.dart';
18+
import 'package:firebase_ai/src/base_model.dart';
1819
import 'package:firebase_core/firebase_core.dart';
1920
import 'package:flutter_test/flutter_test.dart';
2021
import 'package:http/http.dart' as http;
@@ -61,11 +62,11 @@ void main() {
6162
TemplateGenerativeModel createModel(http.Client client,
6263
{bool useVertexBackend = true}) {
6364
// ignore: invalid_use_of_internal_member
64-
return TemplateGenerativeModel.internal(
65+
return createTestTemplateGenerativeModel(
6566
app: app,
6667
location: location,
6768
useVertexBackend: useVertexBackend,
68-
httpClient: client,
69+
client: client,
6970
);
7071
}
7172

@@ -113,12 +114,11 @@ void main() {
113114
TemplateImagenModel createModel(http.Client client,
114115
{bool useVertexBackend = true}) {
115116
// ignore: invalid_use_of_internal_member
116-
return TemplateImagenModel.internal(
117-
app: app,
118-
location: location,
119-
useVertexBackend: useVertexBackend,
120-
httpClient: client,
121-
);
117+
return createTestTemplateImagenModel(
118+
app: app,
119+
location: location,
120+
useVertexBackend: useVertexBackend,
121+
client: client);
122122
}
123123

124124
test('generateImages can make successful request', () async {

0 commit comments

Comments
 (0)