Skip to content

Commit

Permalink
update dependency flutter_rust_bridge
Browse files Browse the repository at this point in the history
  • Loading branch information
canxin121 committed Apr 17, 2024
1 parent 108d3d2 commit fd10423
Show file tree
Hide file tree
Showing 14 changed files with 108 additions and 31 deletions.
2 changes: 1 addition & 1 deletion lib/src/rust/api/bing_client_types.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
2 changes: 1 addition & 1 deletion lib/src/rust/api/bing_client_wrap.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
2 changes: 1 addition & 1 deletion lib/src/rust/api/init.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
2 changes: 1 addition & 1 deletion lib/src/rust/api/utils.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import

Expand Down
50 changes: 40 additions & 10 deletions lib/src/rust/frb_generated.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field

import 'package:get/get.dart';

import 'api/bing_client_types.dart';
import 'api/bing_client_wrap.dart';
import 'api/init.dart';
Expand All @@ -14,6 +12,8 @@ import 'dart:convert';
import 'frb_generated.io.dart' if (dart.library.html) 'frb_generated.web.dart';
import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';

import 'package:get/get.dart';

/// Main entrypoint of the Rust API
class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
@internal
Expand Down Expand Up @@ -58,7 +58,10 @@ class RustLib extends BaseEntrypoint<RustLibApi, RustLibApiImpl, RustLibWire> {
kDefaultExternalLibraryLoaderConfig;

@override
String get codegenVersion => '2.0.0-dev.30';
String get codegenVersion => '2.0.0-dev.32';

@override
int get rustContentHash => 1496273129;

static const kDefaultExternalLibraryLoaderConfig =
ExternalLibraryLoaderConfig(
Expand Down Expand Up @@ -123,29 +126,32 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
required String textMsg,
String? imagePath,
dynamic hint}) {
return handler.executeStream(StreamTask(
final sink = RustStreamSink<String>();
unawaited(handler.executeNormal(NormalTask(
callFfi: (port_) {
final serializer = SseSerializer(generalizedFrbRustBinding);
sse_encode_box_autoadd_wrapped_chat(chat, serializer);
sse_encode_String(textMsg, serializer);
sse_encode_opt_String(imagePath, serializer);
sse_encode_StreamSink_String_Sse(sink, serializer);
pdeCallFfi(generalizedFrbRustBinding, serializer,
funcId: 9, port: port_);
},
codec: SseCodec(
decodeSuccessData: sse_decode_String,
decodeSuccessData: sse_decode_unit,
decodeErrorData: sse_decode_AnyhowException,
),
constMeta: kAskStreamPlainConstMeta,
argValues: [chat, textMsg, imagePath],
argValues: [chat, textMsg, imagePath, sink],
apiImpl: this,
hint: hint,
));
)));
return sink.stream;
}

TaskConstMeta get kAskStreamPlainConstMeta => const TaskConstMeta(
debugName: "ask_stream_plain",
argNames: ["chat", "textMsg", "imagePath"],
argNames: ["chat", "textMsg", "imagePath", "sink"],
);

@override
Expand Down Expand Up @@ -547,6 +553,12 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
return AnyhowException(raw as String);
}

@protected
RustStreamSink<String> dco_decode_StreamSink_String_Sse(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
throw UnimplementedError();
}

@protected
String dco_decode_String(dynamic raw) {
// Codec=Dco (DartCObject based), see doc to use other codecs
Expand Down Expand Up @@ -680,6 +692,13 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
return AnyhowException(inner);
}

@protected
RustStreamSink<String> sse_decode_StreamSink_String_Sse(
SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
throw UnimplementedError('Unreachable ()');
}

@protected
String sse_decode_String(SseDeserializer deserializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
Expand Down Expand Up @@ -844,7 +863,18 @@ class RustLibApiImpl extends RustLibApiImplPlatform implements RustLibApi {
void sse_encode_AnyhowException(
AnyhowException self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
throw UnimplementedError('Unreachable ((');
throw UnimplementedError('Unreachable ()');
}

@protected
void sse_encode_StreamSink_String_Sse(
RustStreamSink<String> self, SseSerializer serializer) {
// Codec=Sse (Serialization based), see doc to use other codecs
sse_encode_String(
self.setupAndSerialize(
codec: SseCodec(
decodeSuccessData: sse_decode_String, decodeErrorData: null)),
serializer);
}

@protected
Expand Down
13 changes: 12 additions & 1 deletion lib/src/rust/frb_generated.io.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field

Expand All @@ -24,6 +24,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
AnyhowException dco_decode_AnyhowException(dynamic raw);

@protected
RustStreamSink<String> dco_decode_StreamSink_String_Sse(dynamic raw);

@protected
String dco_decode_String(dynamic raw);

Expand Down Expand Up @@ -78,6 +81,10 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
AnyhowException sse_decode_AnyhowException(SseDeserializer deserializer);

@protected
RustStreamSink<String> sse_decode_StreamSink_String_Sse(
SseDeserializer deserializer);

@protected
String sse_decode_String(SseDeserializer deserializer);

Expand Down Expand Up @@ -136,6 +143,10 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
void sse_encode_AnyhowException(
AnyhowException self, SseSerializer serializer);

@protected
void sse_encode_StreamSink_String_Sse(
RustStreamSink<String> self, SseSerializer serializer);

@protected
void sse_encode_String(String self, SseSerializer serializer);

Expand Down
13 changes: 12 additions & 1 deletion lib/src/rust/frb_generated.web.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// ignore_for_file: unused_import, unused_element, unnecessary_import, duplicate_ignore, invalid_use_of_internal_member, annotate_overrides, non_constant_identifier_names, curly_braces_in_flow_control_structures, prefer_const_literals_to_create_immutables, unused_field

Expand All @@ -23,6 +23,9 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
AnyhowException dco_decode_AnyhowException(dynamic raw);

@protected
RustStreamSink<String> dco_decode_StreamSink_String_Sse(dynamic raw);

@protected
String dco_decode_String(dynamic raw);

Expand Down Expand Up @@ -77,6 +80,10 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
@protected
AnyhowException sse_decode_AnyhowException(SseDeserializer deserializer);

@protected
RustStreamSink<String> sse_decode_StreamSink_String_Sse(
SseDeserializer deserializer);

@protected
String sse_decode_String(SseDeserializer deserializer);

Expand Down Expand Up @@ -135,6 +142,10 @@ abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
void sse_encode_AnyhowException(
AnyhowException self, SseSerializer serializer);

@protected
void sse_encode_StreamSink_String_Sse(
RustStreamSink<String> self, SseSerializer serializer);

@protected
void sse_encode_String(String self, SseSerializer serializer);

Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -343,10 +343,10 @@ packages:
dependency: "direct main"
description:
name: flutter_rust_bridge
sha256: c02b20ac3bfdfeae9edcd46f8bbdecad942f33f859b43e885bf3030f4de19213
sha256: d65dbdd271de6050d3204bab69a8ae25a291deb359403cd4f95a86055cab66c3
url: "https://pub.dev"
source: hosted
version: "2.0.0-dev.30"
version: "2.0.0-dev.32"
flutter_svg:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies:
cupertino_icons: ^1.0.6
rust_lib_flutter_bing_client:
path: rust_builder
flutter_rust_bridge: 2.0.0-dev.30
flutter_rust_bridge: 2.0.0-dev.32
flutter_chat_ui: ^1.6.12
flutter_chat_types: ^3.6.2
bubble: ^1.2.1
Expand Down
13 changes: 9 additions & 4 deletions rust/Cargo.lock

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

4 changes: 2 additions & 2 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ crate-type = ["cdylib", "staticlib"]

[dependencies]
anyhow = "1.0.81"
bing_client = { git = "https://github.com/canxin121/bing_client"}
bing_client = { git = "https://github.com/canxin121/bing_client" }
dashmap = { version = "5.5.3", features = ["serde"] }
flutter_rust_bridge = { version = "=2.0.0-dev.30", features = [
flutter_rust_bridge = { version = "=2.0.0-dev.32", features = [
"log",
"anyhow",
"console_error_panic_hook",
Expand Down
2 changes: 1 addition & 1 deletion rust/src/frb_generated.io.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// Section: imports

Expand Down
28 changes: 24 additions & 4 deletions rust/src/frb_generated.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

#![allow(
non_camel_case_types,
Expand Down Expand Up @@ -30,7 +30,8 @@ flutter_rust_bridge::frb_generated_boilerplate!(
default_rust_opaque = RustOpaqueMoi,
default_rust_auto_opaque = RustAutoOpaqueMoi,
);
const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.30";
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_VERSION: &str = "2.0.0-dev.32";
pub(crate) const FLUTTER_RUST_BRIDGE_CODEGEN_CONTENT_HASH: i32 = 1496273129;

// Section: executor

Expand All @@ -48,7 +49,7 @@ fn wire_ask_stream_plain_impl(
flutter_rust_bridge::for_generated::TaskInfo {
debug_name: "ask_stream_plain",
port: Some(port_),
mode: flutter_rust_bridge::for_generated::FfiCallMode::Stream,
mode: flutter_rust_bridge::for_generated::FfiCallMode::Normal,
},
move || {
let message = unsafe {
Expand All @@ -64,6 +65,10 @@ fn wire_ask_stream_plain_impl(
<crate::api::bing_client_types::WrappedChat>::sse_decode(&mut deserializer);
let api_text_msg = <String>::sse_decode(&mut deserializer);
let api_image_path = <Option<String>>::sse_decode(&mut deserializer);
let api_sink =
<StreamSink<String, flutter_rust_bridge::for_generated::SseCodec>>::sse_decode(
&mut deserializer,
);
deserializer.end();
move |context| async move {
transform_result_sse(
Expand All @@ -72,7 +77,7 @@ fn wire_ask_stream_plain_impl(
api_chat,
api_text_msg,
api_image_path,
StreamSink::new(context.rust2dart_context().stream_sink::<_, String>()),
api_sink,
)
.await
})()
Expand Down Expand Up @@ -603,6 +608,14 @@ impl SseDecode for flutter_rust_bridge::for_generated::anyhow::Error {
}
}

impl SseDecode for StreamSink<String, flutter_rust_bridge::for_generated::SseCodec> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
let mut inner = <String>::sse_decode(deserializer);
return StreamSink::deserialize(inner);
}
}

impl SseDecode for String {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_decode(deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer) -> Self {
Expand Down Expand Up @@ -894,6 +907,13 @@ impl SseEncode for flutter_rust_bridge::for_generated::anyhow::Error {
}
}

impl SseEncode for StreamSink<String, flutter_rust_bridge::for_generated::SseCodec> {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
unimplemented!("")
}
}

impl SseEncode for String {
// Codec=Sse (Serialization based), see doc to use other codecs
fn sse_encode(self, serializer: &mut flutter_rust_bridge::for_generated::SseSerializer) {
Expand Down
2 changes: 1 addition & 1 deletion rust/src/frb_generated.web.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is automatically generated, so please do not edit it.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.30.
// Generated by `flutter_rust_bridge`@ 2.0.0-dev.32.

// Section: imports

Expand Down

0 comments on commit fd10423

Please sign in to comment.