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

Author: CloudimplBot

apicontext/context.go

@@ -0,0 +1,15 @@
+package apicontext
+
+import (
+	"context"
+	"github.com/cloudimpl/next-coder-sdk/polycode"
+)
+
+func FromContext(ctx context.Context) (polycode.ApiContext, error) {
+	value := ctx.Value("polycode.context")
+	if value == nil {
+		return polycode.ApiContext{}, polycode.ErrContextNotFound
+	}
+
+	return value.(polycode.ApiContext), nil
+}

polycode/context.go

@@ -2,7 +2,6 @@ package polycode
 
 import (
 	"context"
-	"os"
 	"time"
 )
 
@@ -78,6 +77,33 @@ func (wc WorkflowContext) Service(serviceId string) (RemoteService, error) {
 	return RemoteService{ctx: wc.ctx, sessionId: wc.sessionId, serviceId: serviceId, serviceClient: wc.serviceClient}, nil
 }
 
-func (wc WorkflowContext) LocalService() (RemoteService, error) {
-	return RemoteService{ctx: wc.ctx, sessionId: wc.sessionId, serviceId: os.Getenv("polycode_SERVICE_ID"), serviceClient: wc.serviceClient}, nil
+type ApiContext struct {
+	ctx           context.Context
+	sessionId     string
+	serviceClient *ServiceClient
+	config        AppConfig
+}
+
+func (wc ApiContext) AppConfig() AppConfig {
+	return wc.config
+}
+
+func (wc ApiContext) Deadline() (deadline time.Time, ok bool) {
+	return wc.ctx.Deadline()
+}
+
+func (wc ApiContext) Done() <-chan struct{} {
+	return wc.ctx.Done()
+}
+
+func (wc ApiContext) Err() error {
+	return wc.ctx.Err()
+}
+
+func (wc ApiContext) Value(key any) any {
+	return wc.ctx.Value(key)
+}
+
+func (wc ApiContext) Service(serviceId string) (RemoteService, error) {
+	return RemoteService{ctx: wc.ctx, sessionId: wc.sessionId, serviceId: serviceId, serviceClient: wc.serviceClient}, nil
 }

polycode/task.go

@@ -31,10 +31,13 @@ type RouteData struct {
 }
 
 type TaskStartEvent struct {
-	Id         string    `json:"id"`
-	SessionId  string    `json:"sessionId"`
-	EntryPoint string    `json:"entryPoint"`
-	Input      TaskInput `json:"input"`
+	Id           string    `json:"id"`
+	SessionId    string    `json:"sessionId"`
+	TenantId     string    `json:"tenantId"`
+	ServiceName  string    `json:"serviceName"`
+	PartitionKey string    `json:"partitionKey"`
+	EntryPoint   string    `json:"entryPoint"`
+	Input        TaskInput `json:"input"`
 }
 
 type TaskCompleteEvent struct {
@@ -239,7 +242,8 @@ func runTask(ctx context.Context, event any) (evt *TaskCompleteEvent) {
 					config:        appConfig,
 				}
 
-				println(fmt.Sprintf("client: exec workflow %s with session id %s", it.EntryPoint, it.SessionId))
+				println(fmt.Sprintf("client: service %s exec workflow %s with session id %s", it.ServiceName,
+					it.EntryPoint, it.SessionId))
 				ret, err = service.ExecuteWorkflow(workflowCtx, it.EntryPoint, inputObj)
 			} else {
 				srvCtx := ServiceContext{
@@ -249,7 +253,8 @@ func runTask(ctx context.Context, event any) (evt *TaskCompleteEvent) {
 					config:    appConfig,
 				}
 
-				println(fmt.Sprintf("client: exec service %s with session id %s", it.EntryPoint, it.SessionId))
+				println(fmt.Sprintf("client: service %s exec handler %s with session id %s", it.ServiceName,
+					it.EntryPoint, it.SessionId))
 				ret, err = service.ExecuteService(srvCtx, it.EntryPoint, inputObj)
 			}
 
@@ -276,15 +281,15 @@ func runTask(ctx context.Context, event any) (evt *TaskCompleteEvent) {
 				return errorToTaskComplete(ErrBadRequest)
 			}
 
-			workflowCtx := WorkflowContext{
+			apiCtx := ApiContext{
 				ctx:           ctx,
 				sessionId:     it.SessionId,
 				serviceClient: serviceClient,
 				config:        appConfig,
 			}
-			wkfCtx := context.WithValue(ctx, "polycode.context", workflowCtx)
+			newCtx := context.WithValue(ctx, "polycode.context", apiCtx)
 
-			req, err := ConvertToHttpRequest(wkfCtx, it.Request)
+			req, err := ConvertToHttpRequest(newCtx, it.Request)
 			if err != nil {
 				println("client: failed to convert api request")
 				return errorToTaskComplete(err)