@dxos/functions 0.8.4-main.8342792842 → 0.8.4-main.8360d9e660

package/README.md

@@ -27,11 +27,9 @@ import { FunctionContext } from '@dxos/functions';
 
 export default (event: any, context: FunctionContext) => {
   const identity = context.client.halo.identity.get();
-  return context
-    .status(200)
-    .succeed({ 
-      message: `Hello ${identity?.profile?.displayName}` 
-    });
+  return context.status(200).succeed({
+    message: `Hello ${identity?.profile?.displayName}`,
+  });
 };
 ```
 
@@ -69,7 +67,7 @@ nodemon -w ./src -e ts --exec $(git rev-parse --show-toplevel)/packages/devtools
 > NOTE: The port (7001) must match the one in config.
 
 ```bash
-curl http://localhost:7001/dev/hello -X POST -H 'Content-Type: application/json' -w '\n' --data '{ "message": "Hello World!" }' 
+curl http://localhost:7001/dev/hello -X POST -H 'Content-Type: application/json' -w '\n' --data '{ "message": "Hello World!" }'
 ```
 
 ## DXOS Resources

package/dist/lib/neutral/index.mjs

@@ -38,7 +38,7 @@ import * as Schema6 from "effect/Schema";
 // src/sdk.ts
 import * as Effect from "effect/Effect";
 import * as Schema5 from "effect/Schema";
-import { Obj as Obj4, Type as Type5 } from "@dxos/echo";
+import { JsonSchema as JsonSchema2, Obj as Obj5 } from "@dxos/echo";
 import { assertArgument, failedInvariant } from "@dxos/invariant";
 import { Operation } from "@dxos/operation";
 
@@ -50,7 +50,7 @@ __export(Function_exports, {
   setFrom: () => setFrom
 });
 import * as Schema2 from "effect/Schema";
-import { Annotation as Annotation2, JsonSchema, Obj as Obj2, Type as Type2 } from "@dxos/echo";
+import { Annotation as Annotation2, JsonSchema, Obj as Obj2, Ref as Ref2, Type as Type2 } from "@dxos/echo";
 import { SystemTypeAnnotation } from "@dxos/echo/internal";
 
 // src/types/Script.ts
@@ -69,13 +69,16 @@ var Script = Schema.Struct({
   // TODO(burdon): Change to hash of deployed content.
   // Whether source has changed since last deploy.
   changed: Schema.Boolean.pipe(FormInputAnnotation.set(false), Schema.optional),
-  source: Type.Ref(Text.Text).pipe(FormInputAnnotation.set(false))
+  source: Ref.Ref(Text.Text).pipe(FormInputAnnotation.set(false))
 }).pipe(Type.object({
-  typename: "dxos.org/type/Script",
+  typename: "org.dxos.type.script",
   version: "0.1.0"
 }), Annotation.LabelAnnotation.set([
   "name"
-]));
+]), Annotation.IconAnnotation.set({
+  icon: "ph--code--regular",
+  hue: "sky"
+}));
 var make = ({ source = "", ...props } = {}) => Obj.make(Script, {
   ...props,
   source: Ref.make(Text.make(source))
@@ -102,7 +105,7 @@ var Function = Schema2.Struct({
   updated: Schema2.optional(Schema2.String),
   // Reference to a source script if it exists within ECHO.
   // TODO(burdon): Don't ref ScriptType directly (core).
-  source: Schema2.optional(Type2.Ref(Script)),
+  source: Schema2.optional(Ref2.Ref(Script)),
   inputSchema: Schema2.optional(JsonSchema.JsonSchema),
   outputSchema: Schema2.optional(JsonSchema.JsonSchema),
   /**
@@ -113,11 +116,14 @@ var Function = Schema2.Struct({
   // Local binding to a function name.
   binding: Schema2.optional(Schema2.String)
 }).pipe(Type2.object({
-  typename: "dxos.org/type/Function",
+  typename: "org.dxos.type.function",
   version: "0.1.0"
 }), Annotation2.LabelAnnotation.set([
   "name"
-]), SystemTypeAnnotation.set(true));
+]), Annotation2.IconAnnotation.set({
+  icon: "ph--function--regular",
+  hue: "blue"
+}), SystemTypeAnnotation.set(true));
 var make2 = (props) => Obj2.make(Function, props);
 var setFrom = (target, source) => {
   Obj2.change(target, (t) => {
@@ -147,7 +153,7 @@ __export(Trigger_exports, {
 });
 import * as Schema3 from "effect/Schema";
 import * as SchemaAST from "effect/SchemaAST";
-import { Obj as Obj3, QueryAST, Type as Type3 } from "@dxos/echo";
+import { Annotation as Annotation3, Obj as Obj3, QueryAST, Ref as Ref3, Type as Type3 } from "@dxos/echo";
 import { OptionsAnnotationId, SystemTypeAnnotation as SystemTypeAnnotation2 } from "@dxos/echo/internal";
 import { DXN } from "@dxos/keys";
 import { Expando } from "@dxos/schema";
@@ -220,7 +226,7 @@ var TriggerSchema = Schema3.Struct({
   * Function or workflow to invoke.
   */
   // TODO(dmaretskyi): Can be a Ref(FunctionType) or Ref(ComputeGraphType).
-  function: Schema3.optional(Type3.Ref(Expando.Expando).annotations({
+  function: Schema3.optional(Ref3.Ref(Expando.Expando).annotations({
     title: "Function"
   })),
   /**
@@ -237,13 +243,18 @@ var TriggerSchema = Schema3.Struct({
     title: "Enabled"
   })),
   spec: Schema3.optional(Spec),
+  concurrency: Schema3.optional(Schema3.Number.annotations({
+    title: "Concurrency",
+    default: 1,
+    description: "Maximum number of concurrent invocations of the trigger. For queue triggers, this will process queue items in parallel."
+  })),
   /**
   * Passed as the input data to the function.
   * Must match the function's input schema.
   *
   * @example
   * {
-  *   item: '{{$.trigger.event}}',
+  *   item: '{{event.item}}',
   *   instructions: 'Summarize and perform entity-extraction'
   *   mailbox: { '/': 'dxn:echo:AAA:ZZZ' }
   * }
@@ -253,8 +264,11 @@ var TriggerSchema = Schema3.Struct({
     value: Schema3.Any
   }))
 }).pipe(Type3.object({
-  typename: "dxos.org/type/Trigger",
+  typename: "org.dxos.type.trigger",
   version: "0.1.0"
+}), Annotation3.IconAnnotation.set({
+  icon: "ph--lightning--regular",
+  hue: "yellow"
 }), SystemTypeAnnotation2.set(true));
 var Trigger = TriggerSchema;
 var make3 = (props) => Obj3.make(Trigger, props);
@@ -270,7 +284,7 @@ __export(TriggerEvent_exports, {
   WebhookEvent: () => WebhookEvent
 });
 import * as Schema4 from "effect/Schema";
-import { DXN as DXN2, Type as Type4 } from "@dxos/echo";
+import { DXN as DXN2, Obj as Obj4, Ref as Ref4 } from "@dxos/echo";
 var EmailEvent = Schema4.Struct({
   from: Schema4.String,
   to: Schema4.String,
@@ -292,7 +306,7 @@ var SubscriptionEvent = Schema4.Struct({
   /**
   * Reference to the object that was changed or created.
   */
-  subject: Type4.Ref(Type4.Obj),
+  subject: Ref4.Ref(Obj4.Unknown),
   /**
   * @deprecated
   */
@@ -313,8 +327,8 @@ var WebhookEvent = Schema4.Struct({
 var TriggerEvent = Schema4.Union(EmailEvent, QueueEvent, SubscriptionEvent, TimerEvent, WebhookEvent);
 
 // src/types/url.ts
-var FUNCTIONS_META_KEY = "dxos.org/service/function";
-var FUNCTIONS_PRESET_META_KEY = "dxos.org/service/function-preset";
+var FUNCTIONS_META_KEY = "org.dxos.service.function";
+var FUNCTIONS_PRESET_META_KEY = "org.dxos.service.function-preset";
 var getUserFunctionIdInMetadata = (meta) => {
   return meta.keys.find((key) => key.source === FUNCTIONS_META_KEY)?.id;
 };
@@ -333,7 +347,7 @@ var setUserFunctionIdInMetadata = (meta, functionId) => {
 };
 
 // src/sdk.ts
-var typeId = Symbol.for("@dxos/functions/FunctionDefinition");
+var typeId = /* @__PURE__ */ Symbol.for("@dxos/functions/FunctionDefinition");
 var defineFunction = ({ key, name, description, inputSchema, outputSchema = Schema5.Any, handler, types, services }) => {
   if (!Schema5.isSchema(inputSchema)) {
     throw new Error("Input schema must be a valid schema");
@@ -420,14 +434,14 @@ var toOperation = (functionDef) => {
 var FunctionDefinition = {
   make: defineFunction,
   isFunction: (value2) => {
-    return typeof value2 === "object" && value2 !== null && Symbol.for("@dxos/functions/FunctionDefinition") in value2;
+    return typeof value2 === "object" && value2 !== null && /* @__PURE__ */ Symbol.for("@dxos/functions/FunctionDefinition") in value2;
   },
   serialize: (functionDef) => {
     assertArgument(FunctionDefinition.isFunction(functionDef), "functionDef");
     return serializeFunction(functionDef);
   },
   deserialize: (functionObj) => {
-    assertArgument(Obj4.instanceOf(Function_exports.Function, functionObj), "functionObj");
+    assertArgument(Obj5.instanceOf(Function_exports.Function, functionObj), "functionObj");
     return deserializeFunction(functionObj);
   },
   toOperation
@@ -438,12 +452,12 @@ var serializeFunction = (functionDef) => {
     name: functionDef.name,
     version: "0.1.0",
     description: functionDef.description,
-    inputSchema: Type5.toJsonSchema(functionDef.inputSchema),
-    outputSchema: !functionDef.outputSchema ? void 0 : Type5.toJsonSchema(functionDef.outputSchema),
+    inputSchema: JsonSchema2.toJsonSchema(functionDef.inputSchema),
+    outputSchema: !functionDef.outputSchema ? void 0 : JsonSchema2.toJsonSchema(functionDef.outputSchema),
     services: functionDef.services
   });
   if (functionDef.meta?.deployedFunctionId) {
-    Obj4.change(fn4, (fn5) => setUserFunctionIdInMetadata(Obj4.getMeta(fn5), functionDef.meta.deployedFunctionId));
+    Obj5.change(fn4, (fn5) => setUserFunctionIdInMetadata(Obj5.getMeta(fn5), functionDef.meta.deployedFunctionId));
   }
   return fn4;
 };
@@ -454,15 +468,15 @@ var deserializeFunction = (functionObj) => {
     key: functionObj.key ?? functionObj.name,
     name: functionObj.name,
     description: functionObj.description,
-    inputSchema: !functionObj.inputSchema ? Schema5.Unknown : Type5.toEffectSchema(functionObj.inputSchema),
-    outputSchema: !functionObj.outputSchema ? void 0 : Type5.toEffectSchema(functionObj.outputSchema),
+    inputSchema: !functionObj.inputSchema ? Schema5.Unknown : JsonSchema2.toEffectSchema(functionObj.inputSchema),
+    outputSchema: !functionObj.outputSchema ? void 0 : JsonSchema2.toEffectSchema(functionObj.outputSchema),
     // TODO(dmaretskyi): This should throw error.
     handler: () => {
     },
     services: functionObj.services ?? [],
     types: [],
     meta: {
-      deployedFunctionId: getUserFunctionIdInMetadata(Obj4.getMeta(functionObj))
+      deployedFunctionId: getUserFunctionIdInMetadata(Obj5.getMeta(functionObj))
     }
   };
 };
@@ -532,12 +546,11 @@ var sleep_default = defineFunction({
 });
 
 // src/example/index.ts
-(function(Example2) {
-  Example2.fib = fib_default;
-  Example2.reply = reply_default;
-  Example2.sleep = sleep_default;
-})(Example || (Example = {}));
-var Example;
+var ExampleFunctions = {
+  Fibonacci: fib_default,
+  Reply: reply_default,
+  Sleep: sleep_default
+};
 
 // src/services/credentials.ts
 import * as HttpClient from "@effect/platform/HttpClient";
@@ -633,7 +646,7 @@ import * as Context3 from "effect/Context";
 import * as Effect7 from "effect/Effect";
 import * as Layer3 from "effect/Layer";
 import * as Schema9 from "effect/Schema";
-import { Obj as Obj6, Type as Type6 } from "@dxos/echo";
+import { Obj as Obj7, Type as Type4 } from "@dxos/echo";
 import { invariant } from "@dxos/invariant";
 import { LogLevel, log as log2 } from "@dxos/log";
 
@@ -642,7 +655,7 @@ import * as Context2 from "effect/Context";
 import * as Effect6 from "effect/Effect";
 import * as Layer2 from "effect/Layer";
 import { AgentStatus } from "@dxos/ai";
-import { Obj as Obj5 } from "@dxos/echo";
+import { Obj as Obj6 } from "@dxos/echo";
 import { ObjectId } from "@dxos/keys";
 import { Message } from "@dxos/types";
 var TracingService = class _TracingService extends Context2.Tag("@dxos/functions/TracingService")() {
@@ -685,7 +698,7 @@ var TracingService = class _TracingService extends Context2.Tag("@dxos/functions
   */
   static emitStatus = Effect6.fnUntraced(function* (data) {
     const tracing = yield* _TracingService;
-    tracing.write(Obj5.make(AgentStatus, {
+    tracing.write(Obj6.make(AgentStatus, {
       parentMessage: tracing.getTraceContext().parentMessage,
       toolCallId: tracing.getTraceContext().toolCallId,
       created: (/* @__PURE__ */ new Date()).toISOString(),
@@ -694,7 +707,7 @@ var TracingService = class _TracingService extends Context2.Tag("@dxos/functions
   });
   static emitConverationMessage = Effect6.fnUntraced(function* (data) {
     const tracing = yield* _TracingService;
-    tracing.write(Obj5.make(Message.Message, {
+    tracing.write(Obj6.make(Message.Message, {
       parentMessage: tracing.getTraceContext().parentMessage,
       ...data,
       properties: {
@@ -739,8 +752,8 @@ var ComputeEventPayload = Schema9.Union(Schema9.Struct({
 }));
 var ComputeEvent = Schema9.Struct({
   payload: ComputeEventPayload
-}).pipe(Type6.object({
-  typename: "dxos.org/type/ComputeEvent",
+}).pipe(Type4.object({
+  typename: "org.dxos.type.compute-event",
   version: "0.1.0"
 }));
 var ComputeEventLogger = class _ComputeEventLogger extends Context3.Tag("@dxos/functions/ComputeEventLogger")() {
@@ -756,7 +769,7 @@ var ComputeEventLogger = class _ComputeEventLogger extends Context3.Tag("@dxos/f
     const tracing = yield* TracingService;
     return {
       log: (event) => {
-        tracing.write(Obj6.make(ComputeEvent, {
+        tracing.write(Obj7.make(ComputeEvent, {
           payload: event
         }), tracing.getTraceContext());
       },
@@ -872,9 +885,9 @@ import * as SchemaAST2 from "effect/SchemaAST";
 import { AiModelResolver, AiService } from "@dxos/ai";
 import { AnthropicResolver } from "@dxos/ai/resolvers";
 import { LifecycleState, Resource } from "@dxos/context";
-import { Database as Database2, Ref as Ref2, Type as Type7 } from "@dxos/echo";
+import { Database as Database2, Feed, JsonSchema as JsonSchema3, Ref as Ref5 } from "@dxos/echo";
 import { refFromEncodedReference } from "@dxos/echo/internal";
-import { EchoClient } from "@dxos/echo-db";
+import { EchoClient, createFeedServiceLayer } from "@dxos/echo-db";
 import { runAndForwardErrors } from "@dxos/effect";
 import { assertState, failedInvariant as failedInvariant2, invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
@@ -1010,12 +1023,12 @@ var wrapFunctionHandler = (func) => {
       key: func.key,
       name: func.name,
       description: func.description,
-      inputSchema: Type7.toJsonSchema(func.inputSchema),
-      outputSchema: func.outputSchema === void 0 ? void 0 : Type7.toJsonSchema(func.outputSchema),
+      inputSchema: JsonSchema3.toJsonSchema(func.inputSchema),
+      outputSchema: func.outputSchema === void 0 ? void 0 : JsonSchema3.toJsonSchema(func.outputSchema),
       services: func.services
     },
     handler: async ({ data, context }) => {
-      if ((func.services.includes(Database2.Service.key) || func.services.includes(QueueService.key)) && (!context.services.dataService || !context.services.queryService)) {
+      if ((func.services.includes(Database2.Service.key) || func.services.includes(QueueService.key) || func.services.includes(Feed.Service.key)) && (!context.services.dataService || !context.services.queryService)) {
         throw new FunctionError({
           message: "Services not provided: dataService, queryService"
         });
@@ -1041,7 +1054,7 @@ var wrapFunctionHandler = (func) => {
           if (func.types.length > 0) {
             invariant2(funcContext.db, "Database is required for functions with types", {
               F: __dxlog_file3,
-              L: 68,
+              L: 70,
               S: void 0,
               A: [
                 "funcContext.db",
@@ -1112,6 +1125,7 @@ var FunctionContext = class extends Resource {
     assertState(this._lifecycleState === LifecycleState.OPEN, "FunctionContext is not open");
     const dbLayer = this.db ? Database2.layer(this.db) : Database2.notAvailable;
     const queuesLayer = this.queues ? QueueService.layer(this.queues) : QueueService.notAvailable;
+    const feedLayer = this.queues ? createFeedServiceLayer(this.queues) : Feed.notAvailable;
     const credentials = dbLayer ? CredentialsService.layerFromDatabase({
       caching: true
     }).pipe(Layer7.provide(dbLayer)) : CredentialsService.configuredLayer([]);
@@ -1121,7 +1135,7 @@ var FunctionContext = class extends Resource {
       // Note: It doesn't matter what is base url here, it will be proxied to ai gateway in edge.
       apiUrl: "http://internal/provider/anthropic"
     }).pipe(Layer7.provide(FunctionsAiHttpClient.layer(this.context.services.functionsAiService))))))) : AiService.notAvailable;
-    return Layer7.mergeAll(dbLayer, queuesLayer, credentials, functionInvocationService, aiLayer, tracing);
+    return Layer7.mergeAll(dbLayer, queuesLayer, feedLayer, credentials, functionInvocationService, aiLayer, tracing);
   }
 };
 var MockedFunctionInvocationService = Layer7.succeed(FunctionInvocationService, {
@@ -1133,8 +1147,8 @@ var decodeRefsFromSchema = (ast, value2, db) => {
     return value2;
   }
   const encoded = SchemaAST2.encodedBoundAST(ast);
-  if (Ref2.isRefType(encoded)) {
-    if (Ref2.isRef(value2)) {
+  if (Ref5.isRefType(encoded)) {
+    if (Ref5.isRef(value2)) {
       return value2;
     }
     if (typeof value2 === "object" && value2 !== null && typeof value2["/"] === "string") {
@@ -1198,7 +1212,7 @@ export {
   ConfiguredCredentialsService,
   ContextQueueService,
   CredentialsService,
-  Example,
+  ExampleFunctions,
   FUNCTIONS_META_KEY,
   FUNCTIONS_PRESET_META_KEY,
   Function_exports as Function,