Update from https://github.com/cloudimpl/next-coder/commit/e435116baccd7b4094a3de2fad4ccf14f2b3ebc6

Author: CloudimplBot

polycode/client.go

@@ -28,10 +28,12 @@ type StartAppRequest struct {
 }
 
 type ExecServiceRequest struct {
-	Service string      `json:"service"`
-	Method  string      `json:"method"`
-	Options TaskOptions `json:"options"`
-	Input   any         `json:"input"`
+	Service      string      `json:"service"`
+	TenantId     string      `json:"tenantId"`
+	PartitionKey string      `json:"partitionKey"`
+	Method       string      `json:"method"`
+	Options      TaskOptions `json:"options"`
+	Input        any         `json:"input"`
 }
 
 type ExecServiceExtendedRequest struct {

polycode/context.go

@@ -15,15 +15,15 @@ type ServiceContext interface {
 type WorkflowContext interface {
 	context.Context
 	AppConfig() AppConfig
-	Service(service string) (RemoteService, error)
-	Controller(controller string) (RemoteController, error)
+	Service(service string) *RemoteServiceBuilder
+	Controller(controller string) RemoteController
 }
 
 type ApiContext interface {
 	context.Context
 	AppConfig() AppConfig
-	Service(service string) (RemoteService, error)
-	Controller(controller string) (RemoteController, error)
+	Service(service string) *RemoteServiceBuilder
+	Controller(controller string) RemoteController
 }
 
 type RawContext interface {
@@ -72,12 +72,14 @@ func (s ContextImpl) FileStore() FileStore {
 	return s.fileStore
 }
 
-func (s ContextImpl) Service(service string) (RemoteService, error) {
-	return RemoteService{ctx: s.ctx, sessionId: s.sessionId, service: service, serviceClient: s.serviceClient}, nil
+func (s ContextImpl) Service(service string) *RemoteServiceBuilder {
+	return &RemoteServiceBuilder{
+		ctx: s.ctx, sessionId: s.sessionId, service: service, serviceClient: s.serviceClient,
+	}
 }
 
-func (s ContextImpl) Controller(controller string) (RemoteController, error) {
-	return RemoteController{ctx: s.ctx, sessionId: s.sessionId, controller: controller, serviceClient: s.serviceClient}, nil
+func (s ContextImpl) Controller(controller string) RemoteController {
+	return RemoteController{ctx: s.ctx, sessionId: s.sessionId, controller: controller, serviceClient: s.serviceClient}
 }
 
 func (s ContextImpl) ServiceExec(req ExecServiceExtendedRequest) (ExecServiceResponse, error) {

polycode/model.go

@@ -15,13 +15,6 @@ type TaskOptions struct {
 	Retries         int             `json:"retries"`
 	RetryOnFail     bool            `json:"retryOnFail"`
 	BackoffStrategy BackoffStrategy `json:"backoffStrategy"`
-	PartitionKey    string          `json:"partitionKey"`
-	TenantId        string          `json:"tenantId"`
-}
-
-func (t TaskOptions) WithPartitionKey(partitionKey string) TaskOptions {
-	t.PartitionKey = partitionKey
-	return t
 }
 
 func (t TaskOptions) WithTimeout(timeout time.Duration) TaskOptions {

polycode/service.go

@@ -35,19 +35,53 @@ func (r Response) GetAny() (any, error) {
 	}
 }
 
+type RemoteServiceBuilder struct {
+	ctx           context.Context
+	sessionId     string
+	service       string
+	serviceClient *ServiceClient
+	tenantId      string
+	partitionKey  string
+}
+
+func (r *RemoteServiceBuilder) WithTenantId(tenantId string) *RemoteServiceBuilder {
+	r.tenantId = tenantId
+	return r
+}
+
+func (r *RemoteServiceBuilder) WithPartitionKey(partitionKey string) *RemoteServiceBuilder {
+	r.partitionKey = partitionKey
+	return r
+}
+
+func (r *RemoteServiceBuilder) Get() RemoteService {
+	return RemoteService{
+		ctx:           r.ctx,
+		sessionId:     r.sessionId,
+		service:       r.service,
+		serviceClient: r.serviceClient,
+		tenantId:      r.tenantId,
+		partitionKey:  r.partitionKey,
+	}
+}
+
 type RemoteService struct {
 	ctx           context.Context
 	sessionId     string
 	service       string
 	serviceClient *ServiceClient
+	tenantId      string
+	partitionKey  string
 }
 
 func (r RemoteService) RequestReply(options TaskOptions, method string, input any) Response {
 	req := ExecServiceRequest{
-		Service: r.service,
-		Method:  method,
-		Options: options,
-		Input:   input,
+		Service:      r.service,
+		TenantId:     r.tenantId,
+		PartitionKey: r.partitionKey,
+		Method:       method,
+		Options:      options,
+		Input:        input,
 	}
 
 	output, err := r.serviceClient.ExecService(r.sessionId, req)