Skip to content

Commit 0a597db

Browse files
committed
client: remove servermode
1 parent c337d70 commit 0a597db

File tree

2 files changed

+8
-39
lines changed

2 files changed

+8
-39
lines changed

examples/cmd/examples-go/client/main.go

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ import (
1616
"golang.org/x/net/http2"
1717
)
1818

19-
type mode int
20-
21-
const (
22-
modeClient mode = iota + 1
23-
// for future use?
24-
modeServer
25-
)
2619

2720
type rpc int
2821

@@ -34,37 +27,18 @@ const (
3427
)
3528

3629
var (
37-
runMode mode
3830
rpcType rpc
3931
)
4032

4133
func init() {
42-
// mode
43-
clientMode := flag.Bool("c", false, "run client mode")
44-
serverMode := flag.Bool("s", false, "run server mode")
4534
// rpc
4635
unaryRPC := flag.Bool("u", false, "send unary RPC")
47-
serverStreamingRPC := flag.Bool("ss", false, "send unary RPC")
48-
clientStreamingRPC := flag.Bool("cs", false, "send unary RPC")
49-
bidiRPC := flag.Bool("bidi", false, "send unary RPC")
36+
serverStreamingRPC := flag.Bool("ss", false, "send server streaming RPC")
37+
clientStreamingRPC := flag.Bool("cs", false, "send client streaming RPC")
38+
bidiRPC := flag.Bool("bidi", false, "send bidirectional streaming RPC")
5039

5140
flag.Parse()
5241

53-
switch {
54-
case *clientMode:
55-
runMode = modeClient
56-
case *serverMode:
57-
runMode = modeServer
58-
default: // throw
59-
if !*clientMode && !*serverMode {
60-
log.Fatal("either clientMode or serverMode must be enabled. [-c, -s]")
61-
}
62-
if *clientMode && *serverMode {
63-
log.Fatal("neither clientMode nor serverMode can't be enabled")
64-
}
65-
panic("unreachable")
66-
}
67-
6842
switch {
6943
case *unaryRPC:
7044
rpcType = unary
@@ -86,13 +60,8 @@ func asError(err error) (*connect.Error, bool) {
8660
}
8761

8862
func main() {
89-
switch runMode {
90-
case modeClient:
91-
if err := runClient(); err != nil {
92-
log.Fatal(err)
93-
}
94-
case modeServer:
95-
// TODO(tsubakiky): not implemented yet
63+
if err := runClient(); err != nil {
64+
log.Fatal(err)
9665
}
9766
}
9867

examples/proto/connectrpc/eliza/v1/v1connect/eliza_connect_pb2.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from connect.client import Client
1111
from connect.connect import StreamRequest, StreamResponse, UnaryRequest, UnaryResponse
1212
from connect.connection_pool import AsyncConnectionPool
13-
from connect.handler import ClientStreamHandler, Handler, ServerStreamHandler, UnaryHandler
13+
from connect.handler import ClientStreamHandler, Handler, ServerStreamHandler, UnaryHandler, BidiStreamHandler
1414
from connect.handler_context import HandlerContext
1515
from connect.options import ClientOptions, ConnectOptions
1616
from google.protobuf.descriptor import MethodDescriptor, ServiceDescriptor
@@ -57,7 +57,7 @@ def __init__(self, base_url: str, pool: AsyncConnectionPool, options: ClientOpti
5757
).call_server_stream
5858
self.Introduce = Client[IntroduceRequest, IntroduceResponse](
5959
pool, base_url + ElizaServiceProcedures.Introduce.value, IntroduceRequest, IntroduceResponse, options
60-
).call_server_stream
60+
).call_bidi_stream
6161
self.Reflect = Client[ReflectRequest, ReflectResponse](
6262
pool, base_url + ElizaServiceProcedures.Reflect.value, ReflectRequest, ReflectResponse, options
6363
).call_client_stream
@@ -94,7 +94,7 @@ def create_ElizaService_handlers(service: ElizaServiceHandler, options: ConnectO
9494
output=SayResponse,
9595
options=options,
9696
),
97-
ServerStreamHandler(
97+
BidiStreamHandler(
9898
procedure=ElizaServiceProcedures.Converse.value,
9999
stream=service.Converse,
100100
input=ConverseRequest,

0 commit comments

Comments
 (0)