Skip to content

Commit

Permalink
feat: Add support for usage metadata in ChatFirebaseVertexAI (davidmi…
Browse files Browse the repository at this point in the history 
…gloz#457)
  • Loading branch information
@davidmigloz @KennethKnudsen97
davidmigloz authored and KennethKnudsen97 committed Oct 1, 2024
1 parent 6681569 commit ed4c28e
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 50 deletions.
6 changes: 3 additions & 3 deletions melos.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ command:
csv: ^6.0.0
equatable: ^2.0.5
fetch_client: ^1.0.2
firebase_app_check: ^0.2.2+5
firebase_core: ^2.31.0
firebase_vertexai: ^0.1.0
firebase_app_check: ^0.3.0
firebase_core: ^3.1.0
firebase_vertexai: ^0.2.2
flat_buffers: ^23.5.26
flutter_bloc: ^8.1.5
flutter_markdown: ^0.6.22
Expand Down
2 changes: 2 additions & 0 deletions packages/langchain_firebase/example/macos/Flutter/GeneratedPluginRegistrant.swift
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 42 additions & 18 deletions packages/langchain_firebase/example/pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
sha256: "2350805d7afefb0efe7acd325cb19d3ae8ba4039b906eade3807ffb69938a01f"
sha256: "0816f12bbbd9e21f72ea8592b11bce4a628d4e5cb7a81ff9f1eee4f3dc23206e"
url: "https://pub.dev"
source: hosted
version: "1.3.33"
version: "1.3.37"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -117,58 +117,82 @@ packages:
dependency: transitive
description:
name: firebase_app_check
sha256: f66b67027de548b6f8b61c7aa752a24804104e7f463723d202ae9c6d9520fa6b
sha256: "8aedc3b274826f923f2cf2d61cddeb014c113fd8604373e2fe3a2068b3f496e7"
url: "https://pub.dev"
source: hosted
version: "0.2.2+5"
version: "0.3.0+1"
firebase_app_check_platform_interface:
dependency: transitive
description:
name: firebase_app_check_platform_interface
sha256: c06fcb2381ff2566f4ebe1a1df2e1798de3d0fad531f673e8539368f33cf6b34
sha256: "93e8aeeb5659c4926682299f175c033fd955fe3a2aa3b2c9a34c55af1ba25f10"
url: "https://pub.dev"
source: hosted
version: "0.1.0+27"
version: "0.1.0+31"
firebase_app_check_web:
dependency: transitive
description:
name: firebase_app_check_web
sha256: "88c8d792d429a43767461312f29baa5d3b76cd0453cf48dd008f8f94393221c1"
sha256: c2933fc26b73d02b791291df00446a6dbf99d1b59e038bb55cbbec74fcb40c4a
url: "https://pub.dev"
source: hosted
version: "0.1.2+5"
version: "0.1.2+9"
firebase_auth:
dependency: transitive
description:
name: firebase_auth
sha256: "3af60a78e92567af3d9a5e25d3955f0f6a3f7a33b900724c1c4c336ff5e44200"
url: "https://pub.dev"
source: hosted
version: "5.1.0"
firebase_auth_platform_interface:
dependency: transitive
description:
name: firebase_auth_platform_interface
sha256: "6941c07a1d129a8b834f85b6673d3455f24102b6338346596c26ef3be2c106ce"
url: "https://pub.dev"
source: hosted
version: "7.4.0"
firebase_auth_web:
dependency: transitive
description:
name: firebase_auth_web
sha256: "5c3f6b45dc141cec858c050d6a6f07bdbfab45ab92a68b32be4b08805bdcadaa"
url: "https://pub.dev"
source: hosted
version: "5.12.2"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
sha256: "372d94ced114b9c40cb85e18c50ac94a7e998c8eec630c50d7aec047847d27bf"
sha256: fae4ab4317c2a7afb13d44ef1e3f9f28a630e10016bc5cfe761e8e6a0ed7816a
url: "https://pub.dev"
source: hosted
version: "2.31.0"
version: "3.1.0"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63
sha256: "1003a5a03a61fc9a22ef49f37cbcb9e46c86313a7b2e7029b9390cf8c6fc32cb"
url: "https://pub.dev"
source: hosted
version: "5.0.0"
version: "5.1.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
sha256: "43d9e951ac52b87ae9cc38ecdcca1e8fa7b52a1dd26a96085ba41ce5108db8e9"
sha256: "6643fe3dbd021e6ccfb751f7882b39df355708afbdeb4130fc50f9305a9d1a3d"
url: "https://pub.dev"
source: hosted
version: "2.17.0"
version: "2.17.2"
firebase_vertexai:
dependency: transitive
description:
name: firebase_vertexai
sha256: "6e61f6717bee3ab563e8e506e0fed98761f98c181626c62d924d06598786e95e"
sha256: a96bc9e8a6e1da0c4bbda2dd24f03b74e069449a3fa7940c87ec611bfc96633d
url: "https://pub.dev"
source: hosted
version: "0.1.0"
version: "0.2.2"
fixnum:
dependency: transitive
description:
Expand Down Expand Up @@ -212,10 +236,10 @@ packages:
dependency: transitive
description:
name: google_generative_ai
sha256: bb7d3480b05afb3b1f2459b52893cb22f69ded4e2fb853e212437123c457f1be
sha256: "76e35d93b8c1cd888f69a1a371f8c5dc54cec372b6c74a4c0a5d506e7cf82c1a"
url: "https://pub.dev"
source: hosted
version: "0.4.0"
version: "0.4.3"
http:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion packages/langchain_firebase/example/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:

dependencies:
cupertino_icons: ^1.0.6
firebase_core: ^2.31.0
firebase_core: ^3.1.0
flutter:
sdk: flutter
flutter_markdown: ^0.6.22
Expand Down
10 changes: 5 additions & 5 deletions packages/langchain_firebase/lib/src/chat_models/vertex_ai/mappers.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ extension GenerateContentResponseMapper on f.GenerateContentResponse {
.toList(growable: false),
'finish_message': candidate.finishMessage,
},
usage: const LanguageModelUsage(
// promptTokens: usageMetadata?.promptTokenCount, // not yet supported
// responseTokens: usageMetadata?.candidatesTokenCount,
// totalTokens: usageMetadata?.totalTokenCount,
),
usage: LanguageModelUsage(
promptTokens: usageMetadata?.promptTokenCount,
responseTokens: usageMetadata?.candidatesTokenCount,
totalTokens: usageMetadata?.totalTokenCount,
),
);
}

Expand Down
60 changes: 42 additions & 18 deletions packages/langchain_firebase/pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
sha256: "2350805d7afefb0efe7acd325cb19d3ae8ba4039b906eade3807ffb69938a01f"
sha256: "0816f12bbbd9e21f72ea8592b11bce4a628d4e5cb7a81ff9f1eee4f3dc23206e"
url: "https://pub.dev"
source: hosted
version: "1.3.33"
version: "1.3.37"
async:
dependency: transitive
description:
Expand Down Expand Up @@ -101,58 +101,82 @@ packages:
dependency: "direct main"
description:
name: firebase_app_check
sha256: f66b67027de548b6f8b61c7aa752a24804104e7f463723d202ae9c6d9520fa6b
sha256: "8aedc3b274826f923f2cf2d61cddeb014c113fd8604373e2fe3a2068b3f496e7"
url: "https://pub.dev"
source: hosted
version: "0.2.2+5"
version: "0.3.0+1"
firebase_app_check_platform_interface:
dependency: transitive
description:
name: firebase_app_check_platform_interface
sha256: c06fcb2381ff2566f4ebe1a1df2e1798de3d0fad531f673e8539368f33cf6b34
sha256: "93e8aeeb5659c4926682299f175c033fd955fe3a2aa3b2c9a34c55af1ba25f10"
url: "https://pub.dev"
source: hosted
version: "0.1.0+27"
version: "0.1.0+31"
firebase_app_check_web:
dependency: transitive
description:
name: firebase_app_check_web
sha256: "88c8d792d429a43767461312f29baa5d3b76cd0453cf48dd008f8f94393221c1"
sha256: c2933fc26b73d02b791291df00446a6dbf99d1b59e038bb55cbbec74fcb40c4a
url: "https://pub.dev"
source: hosted
version: "0.1.2+5"
version: "0.1.2+9"
firebase_auth:
dependency: transitive
description:
name: firebase_auth
sha256: "3af60a78e92567af3d9a5e25d3955f0f6a3f7a33b900724c1c4c336ff5e44200"
url: "https://pub.dev"
source: hosted
version: "5.1.0"
firebase_auth_platform_interface:
dependency: transitive
description:
name: firebase_auth_platform_interface
sha256: "6941c07a1d129a8b834f85b6673d3455f24102b6338346596c26ef3be2c106ce"
url: "https://pub.dev"
source: hosted
version: "7.4.0"
firebase_auth_web:
dependency: transitive
description:
name: firebase_auth_web
sha256: "5c3f6b45dc141cec858c050d6a6f07bdbfab45ab92a68b32be4b08805bdcadaa"
url: "https://pub.dev"
source: hosted
version: "5.12.2"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
sha256: "372d94ced114b9c40cb85e18c50ac94a7e998c8eec630c50d7aec047847d27bf"
sha256: fae4ab4317c2a7afb13d44ef1e3f9f28a630e10016bc5cfe761e8e6a0ed7816a
url: "https://pub.dev"
source: hosted
version: "2.31.0"
version: "3.1.0"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63
sha256: "1003a5a03a61fc9a22ef49f37cbcb9e46c86313a7b2e7029b9390cf8c6fc32cb"
url: "https://pub.dev"
source: hosted
version: "5.0.0"
version: "5.1.0"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
sha256: "43d9e951ac52b87ae9cc38ecdcca1e8fa7b52a1dd26a96085ba41ce5108db8e9"
sha256: "6643fe3dbd021e6ccfb751f7882b39df355708afbdeb4130fc50f9305a9d1a3d"
url: "https://pub.dev"
source: hosted
version: "2.17.0"
version: "2.17.2"
firebase_vertexai:
dependency: "direct main"
description:
name: firebase_vertexai
sha256: "6e61f6717bee3ab563e8e506e0fed98761f98c181626c62d924d06598786e95e"
sha256: a96bc9e8a6e1da0c4bbda2dd24f03b74e069449a3fa7940c87ec611bfc96633d
url: "https://pub.dev"
source: hosted
version: "0.1.0"
version: "0.2.2"
fixnum:
dependency: transitive
description:
Expand Down Expand Up @@ -180,10 +204,10 @@ packages:
dependency: transitive
description:
name: google_generative_ai
sha256: bb7d3480b05afb3b1f2459b52893cb22f69ded4e2fb853e212437123c457f1be
sha256: "76e35d93b8c1cd888f69a1a371f8c5dc54cec372b6c74a4c0a5d506e7cf82c1a"
url: "https://pub.dev"
source: hosted
version: "0.4.0"
version: "0.4.3"
http:
dependency: transitive
description:
Expand Down
8 changes: 3 additions & 5 deletions packages/langchain_firebase/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ environment:

dependencies:
collection: ">=1.17.0 <1.19.0"
firebase_app_check: ^0.2.2+5
firebase_core: ^2.31.0
firebase_auth: ^5.1.0
cloud_firestore: ^4.17.0
firebase_vertexai: ^0.1.0
firebase_app_check: ^0.3.0
firebase_core: ^3.1.0
firebase_vertexai: ^0.2.2
langchain_core: ^0.3.2
meta: ^1.11.0
uuid: ^4.3.3
Expand Down

0 comments on commit ed4c28e

Please sign in to comment.