@dxos/plugin-automation 0.7.1 → 0.7.2-main.f1adc9f

package/src/components/TriggerEditor/TriggerEditor.tsx

@@ -2,343 +2,58 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { type ChangeEventHandler, type FC, useEffect, useMemo } from 'react';
+import React from 'react';
 
-import {
-  FunctionTriggerSchema,
-  type FunctionTriggerType,
-  type FunctionTrigger,
-  type SubscriptionTrigger,
-  type TimerTrigger,
-  type TriggerType,
-  type TriggerKind,
-  type WebhookTrigger,
-  type WebsocketTrigger,
-} from '@dxos/functions/types';
-import { invariant } from '@dxos/invariant';
-import { ScriptType } from '@dxos/plugin-script/types';
-import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
-import { Input, Select, useTranslation } from '@dxos/react-ui';
+import { FunctionTriggerSchema, type FunctionTriggerType, type FunctionTrigger, TriggerKind } from '@dxos/functions';
+import { FunctionType } from '@dxos/plugin-script/types';
+import { Filter, useQuery, type Space } from '@dxos/react-client/echo';
+import { useTranslation } from '@dxos/react-ui';
 import { Form, SelectInput } from '@dxos/react-ui-form';
-import { distinctBy } from '@dxos/util';
 
-import { InputRow } from './Form';
-import { getFunctionMetaExtension, state } from './meta';
-import { useLocalTriggerManager } from '../../hooks';
 import { AUTOMATION_PLUGIN } from '../../meta';
 
-const triggerTypes: TriggerKind[] = ['timer', 'webhook', 'websocket', 'subscription'];
-
 export type TriggerEditorProps = {
   space: Space;
-  trigger: FunctionTrigger;
+  trigger: Omit<FunctionTrigger, 'id'>;
+  onSave?: (trigger: Omit<FunctionTrigger, 'id'>) => void;
+  onCancel?: () => void;
 };
 
-export const TriggerEditor = ({ space, trigger }: TriggerEditorProps) => {
+export const TriggerEditor = ({ space, trigger, onSave, onCancel }: TriggerEditorProps) => {
   const { t } = useTranslation(AUTOMATION_PLUGIN);
-  const scripts = useQuery(space, Filter.schema(ScriptType));
-  const script = useMemo(() => scripts.find((script) => script.id === trigger.function), [trigger.function, scripts]);
-  useLocalTriggerManager(space);
+  const functions = useQuery(space, Filter.schema(FunctionType));
 
-  const triggerLabels: Record<TriggerKind, string> = {
-    subscription: t('trigger type subscription'),
-    timer: t('trigger type timer'),
-    webhook: t('trigger type webhook'),
-    websocket: t('trigger type websocket'),
+  const handleSave = (values: FunctionTriggerType) => {
+    onSave?.(values);
   };
 
-  useEffect(() => {
-    void space.db.schemaRegistry
-      .query()
-      .then((schemas) => {
-        // TODO(zan): We should solve double adding of stored schemas in the schema registry.
-        state.schemas = distinctBy([...state.schemas, ...schemas], (schema) => schema.typename).sort((a, b) =>
-          a.typename < b.typename ? -1 : 1,
-        );
-      })
-      .catch(() => {});
-  }, [space]);
-
-  // Keen an enriched version of the schema in memory so we can share it with prompt editor.
-  useEffect(() => {
-    const spec = trigger.spec;
-    invariant(spec);
-    if (spec.type === 'subscription') {
-      if (spec.filter) {
-        const type = spec.filter.type;
-        const foundSchema = state.schemas.find((schema) => schema.typename === type);
-        if (foundSchema) {
-          state.selectedSchema[trigger.id] = foundSchema;
-        }
-      }
-    }
-    // TODO(burdon): API issue.
-  }, [JSON.stringify(trigger.spec), state.schemas]);
-
-  useEffect(() => {
-    if (!trigger.meta) {
-      const extension = getFunctionMetaExtension(trigger, script);
-      trigger.meta = extension?.initialValue?.();
-    }
-  }, [trigger.function, trigger.meta]);
-
-  const handleSelectFunction = (value: string) => {
-    const match = scripts.find((fn) => fn.id === value);
-    if (match) {
-      trigger.function = match.id;
-    }
-  };
-
-  const handleSelectTriggerType = (triggerType: string) => {
-    switch (triggerType as TriggerKind) {
-      case 'subscription': {
-        trigger.spec = { type: 'subscription', filter: {} };
-        break;
-      }
-      case 'timer': {
-        trigger.spec = { type: 'timer', cron: '0 0 * * *' };
-        break;
-      }
-      case 'webhook': {
-        trigger.spec = { type: 'webhook', method: 'GET' };
-        break;
-      }
-      case 'websocket': {
-        // TODO(burdon): The `init` property is currently mail worker specific.
-        trigger.spec = { type: 'websocket', url: '', init: { type: 'sync' } };
-        break;
-      }
-    }
-  };
-
-  const TriggerMeta = getFunctionMetaExtension(trigger, script)?.component;
-
-  const test = true;
-  if (test) {
-    const object: FunctionTriggerType = {
-      spec: {
-        // type: 'timer',
-        type: 'subscription',
-        // cron: '0 0 * * *'
-        filter: { type: 'dxos.org/type/Event' },
-      },
-    };
-
-    return (
-      <Form<FunctionTriggerType>
-        schema={FunctionTriggerSchema}
-        values={object}
-        filter={(props) => props.filter((p) => p.name !== 'meta')}
-        Custom={{
-          ['function' satisfies keyof FunctionTriggerType]: (props) => (
-            <SelectInput<FunctionTriggerType>
-              {...props}
-              // TODO(burdon): Query for functions.
-              options={[].map((value) => ({
-                value,
-                label: value,
-              }))}
-            />
-          ),
-          ['spec.type' as const]: (props) => (
-            <SelectInput<FunctionTriggerType>
-              {...props}
-              options={['timer', 'subscription'].map((value) => ({
-                value,
-                label: value,
-              }))}
-            />
-          ),
-        }}
-      />
-    );
-  }
-
   return (
-    <div className='flex flex-col py-1'>
-      <table className='is-full table-fixed'>
-        <tbody>
-          <InputRow label={t('function select label')}>
-            <Select.Root value={script?.id} onValueChange={handleSelectFunction}>
-              <Select.TriggerButton classNames='w-full' placeholder={t('function select placeholder')} />
-              <Select.Portal>
-                <Select.Content>
-                  <Select.Viewport>
-                    {scripts.map(({ id, name }) => (
-                      <Select.Option key={id} value={id}>
-                        {name ?? id}
-                      </Select.Option>
-                    ))}
-                  </Select.Viewport>
-                </Select.Content>
-              </Select.Portal>
-            </Select.Root>
-          </InputRow>
-          {script?.description?.length && (
-            <InputRow>
-              <div className='px-2'>
-                <p className='text-sm text-description'>{script?.description?.length}</p>
-              </div>
-            </InputRow>
-          )}
-          <InputRow label={t('trigger select label')}>
-            <Select.Root value={trigger.spec?.type} onValueChange={handleSelectTriggerType}>
-              <Select.TriggerButton placeholder={t('trigger select placeholder')} />
-              <Select.Portal>
-                <Select.Content>
-                  <Select.Viewport>
-                    {triggerTypes.map((trigger) => (
-                      <Select.Option key={trigger} value={trigger}>
-                        {triggerLabels[trigger]}
-                      </Select.Option>
-                    ))}
-                  </Select.Viewport>
-                </Select.Content>
-              </Select.Portal>
-            </Select.Root>
-          </InputRow>
-        </tbody>
-        <tbody>
-          {trigger.spec && <TriggerType space={space} spec={trigger.spec} />}
-          <InputRow label={t('function enabled')}>
-            {/* TODO(burdon): Hack to make the switch the same height as other controls. */}
-            <div className='flex items-center h-8'>
-              <Input.Switch checked={trigger.enabled} onCheckedChange={(checked) => (trigger.enabled = !!checked)} />
-            </div>
-          </InputRow>
-        </tbody>
-        {TriggerMeta && trigger.meta && (
-          <tbody>
-            <tr>
-              <td />
-              <td className='py-2'>
-                <div className='border-b border-separator' />
-              </td>
-            </tr>
-            <TriggerMeta meta={trigger.meta} />
-          </tbody>
-        )}
-      </table>
-    </div>
+    <Form<FunctionTriggerType>
+      schema={FunctionTriggerSchema}
+      values={trigger}
+      filter={(props) => props.filter((p) => p.name !== 'meta')}
+      onSave={handleSave}
+      onCancel={onCancel}
+      Custom={{
+        ['function' satisfies keyof FunctionTriggerType]: (props) => (
+          <SelectInput<FunctionTriggerType>
+            {...props}
+            options={functions.map(({ name }) => ({
+              value: name,
+              label: name,
+            }))}
+          />
+        ),
+        ['spec.type' as const]: (props) => (
+          <SelectInput<FunctionTriggerType>
+            {...props}
+            options={Object.values(TriggerKind).map((kind) => ({
+              value: kind,
+              label: t(`trigger type ${kind}`),
+            }))}
+          />
+        ),
+      }}
+    />
   );
 };
-
-//
-// Trigger specs
-//
-
-const TriggerSpecSubscription = ({ spec }: TriggerSpecProps<SubscriptionTrigger>) => {
-  const { t } = useTranslation(AUTOMATION_PLUGIN);
-  if (!spec.filter) {
-    return null;
-  }
-
-  const handleValueChange = (typename: string) => {
-    spec.filter = { type: typename };
-  };
-
-  return (
-    <>
-      <InputRow label={t('trigger filter')}>
-        <Select.Root value={spec.filter?.type} onValueChange={handleValueChange}>
-          <Select.TriggerButton classNames='w-full' placeholder={'Select type'} />
-          <Select.Portal>
-            <Select.Content>
-              <Select.Viewport>
-                {state.schemas.map(({ typename }: any) => (
-                  <Select.Option key={typename} value={typename}>
-                    {typename}
-                  </Select.Option>
-                ))}
-              </Select.Viewport>
-            </Select.Content>
-          </Select.Portal>
-        </Select.Root>
-      </InputRow>
-    </>
-  );
-};
-
-const TriggerSpecTimer = ({ spec }: TriggerSpecProps<TimerTrigger>) => {
-  const { t } = useTranslation(AUTOMATION_PLUGIN);
-  return (
-    <>
-      <InputRow label={t('trigger cron')}>
-        <Input.TextInput value={spec.cron} onChange={(event) => (spec.cron = event.target.value)} />
-      </InputRow>
-    </>
-  );
-};
-
-const methods = ['GET', 'POST'];
-
-const TriggerSpecWebhook = ({ spec }: TriggerSpecProps<WebhookTrigger>) => {
-  const { t } = useTranslation(AUTOMATION_PLUGIN);
-  return (
-    <>
-      <InputRow label={t('trigger method')}>
-        <Select.Root value={spec.method} onValueChange={(value) => (spec.method = value)}>
-          <Select.TriggerButton placeholder={'type'} />
-          <Select.Portal>
-            <Select.Content>
-              <Select.Viewport>
-                {methods.map((method) => (
-                  <Select.Option key={method} value={method}>
-                    {method}
-                  </Select.Option>
-                ))}
-              </Select.Viewport>
-            </Select.Content>
-          </Select.Portal>
-        </Select.Root>
-      </InputRow>
-    </>
-  );
-};
-
-const TriggerSpecWebsocket = ({ spec }: TriggerSpecProps<WebsocketTrigger>) => {
-  const { t } = useTranslation(AUTOMATION_PLUGIN);
-
-  const handleChangeInit: ChangeEventHandler<HTMLInputElement> = (event) => {
-    try {
-      spec.init = JSON.parse(event.target.value);
-    } catch (err) {
-      // Ignore.
-    }
-  };
-
-  return (
-    <>
-      <InputRow label={t('trigger method')}>
-        <Input.TextInput
-          value={spec.url}
-          onChange={(event) => (spec.url = event.target.value)}
-          placeholder='https://'
-        />
-      </InputRow>
-      <InputRow label='Init'>
-        <Input.TextInput value={JSON.stringify(spec.init)} onChange={handleChangeInit} placeholder='Initial message.' />
-      </InputRow>
-    </>
-  );
-};
-
-//
-// Trigger spec.
-//
-
-type TriggerSpecProps<T = TriggerType> = { space: Space; spec: T };
-
-const triggerRenderers: {
-  [key in TriggerKind]: FC<TriggerSpecProps<any>>;
-} = {
-  subscription: TriggerSpecSubscription,
-  timer: TriggerSpecTimer,
-  webhook: TriggerSpecWebhook,
-  websocket: TriggerSpecWebsocket,
-};
-
-const TriggerType = ({ space, spec }: TriggerSpecProps) => {
-  const Component = triggerRenderers[spec.type];
-  return Component ? <Component space={space} spec={spec} /> : null;
-};

package/src/components/index.ts

@@ -4,9 +4,5 @@
 
 import { lazy } from 'react';
 
-export const PromptContainer = lazy(() => import('./PromptContainer'));
-
-export * from './AutomationPanel';
-export * from './Chain';
-export * from './PromptEditor';
-export * from './TriggerEditor';
+export const AssistantPanel = lazy(() => import('./AssistantPanel'));
+export const AutomationPanel = lazy(() => import('./AutomationPanel'));

package/src/hooks/invocation-handler.ts

@@ -3,8 +3,8 @@
 //
 
 import { sleep } from '@dxos/async';
-import { getObjectCore } from '@dxos/echo-db';
-import { type AnyObjectData } from '@dxos/echo-schema';
+import { getObjectCore, ResultFormat } from '@dxos/echo-db';
+import type { AnyObjectData } from '@dxos/echo-schema';
 import { type FunctionTrigger } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { DXN, LOCAL_SPACE_TAG } from '@dxos/keys';
@@ -13,8 +13,6 @@ import { FunctionType } from '@dxos/plugin-script';
 import { type Client, type Config } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 
-import { handleEmail } from './email';
-
 const MAX_RETRIES = 3;
 const RETRY_DELAY = 1_000;
 
@@ -49,12 +47,11 @@ export const invokeFunction = async (client: Client, space: Space, trigger: Func
   try {
     invariant(trigger.spec);
     invariant(trigger.function);
-    if (trigger.spec.type === 'websocket') {
-      return handleEmail(space, data.data);
-    }
 
-    const script = await space.crud.query({ id: trigger.function }).first();
-    const { objects: functions } = await space.crud.query({ __typename: FunctionType.typename }).run();
+    const script = await space.db.query({ id: trigger.function }, { format: ResultFormat.Plain }).first();
+    const { objects: functions } = await space.db
+      .query({ __typename: FunctionType.typename }, { format: ResultFormat.Plain })
+      .run();
     const func = functions.find((fn) => referenceEquals(fn.source, trigger.function!)) as AnyObjectData | undefined;
     const funcSlug = func?.__meta.keys.find((key) => key.source === USERFUNCTIONS_META_KEY)?.id;
     if (!funcSlug) {

package/src/hooks/useLocalTriggerManager.ts

@@ -6,8 +6,8 @@ import { useEffect, useState } from 'react';
 
 import { Mutex } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { createSubscriptionTrigger, createWebsocketTrigger, type TriggerFactory } from '@dxos/functions';
-import { FunctionTrigger } from '@dxos/functions/types';
+import { createSubscriptionTrigger, type TriggerFactory } from '@dxos/functions';
+import { FunctionTrigger } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';
@@ -50,8 +50,6 @@ export const useLocalTriggerManager = (space: Space) => {
             let triggerFactory: TriggerFactory<any>;
             if (triggerSpec.type === 'subscription') {
               triggerFactory = createSubscriptionTrigger;
-            } else if (triggerSpec.type === 'websocket') {
-              triggerFactory = createWebsocketTrigger;
             } else {
               log.info('unsupported trigger', { type: triggerSpec.type });
               continue;

package/src/meta.ts

@@ -10,7 +10,7 @@ export default {
   id: AUTOMATION_PLUGIN,
   name: 'Automation',
   description: 'Automation workflows.',
-  icon: 'ph--flow-arrow--regular',
+  icon: 'ph--magic-wand--regular',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/experimental/plugin-automation',
   tags: ['experimental'],
 } satisfies PluginMeta;

package/src/testing/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './testing';

package/src/testing/testing.ts

@@ -0,0 +1,34 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { AST, S, toJsonSchema } from '@dxos/echo-schema';
+
+export const functions = [
+  {
+    name: 'example.com/function/chess',
+    version: 1,
+    inputSchema: toJsonSchema(
+      S.Struct({
+        level: S.Number.annotations({
+          [AST.TitleAnnotationId]: 'Level',
+        }),
+      }),
+    ),
+  },
+  {
+    name: 'example.com/function/forex',
+    version: 1,
+    binding: 'FOREX',
+    inputSchema: toJsonSchema(
+      S.Struct({
+        from: S.String.annotations({
+          [AST.TitleAnnotationId]: 'Currency from',
+        }),
+        to: S.String.annotations({
+          [AST.TitleAnnotationId]: 'Currency to',
+        }),
+      }),
+    ),
+  },
+];

package/src/translations.ts

@@ -25,15 +25,18 @@ export default [
         'trigger select label': 'Trigger',
         'trigger select placeholder': 'Trigger type',
 
-        'trigger type subscription': 'Subscription',
         'trigger type timer': 'Timer',
         'trigger type webhook': 'Webhook',
         'trigger type websocket': 'Websocket',
+        'trigger type subscription': 'Subscription',
 
         'trigger filter': 'Filter',
         'trigger cron': 'Cron',
         'trigger method': 'Method',
         'trigger endpoint': 'Endpoint',
+
+        'open assistant panel label': 'Show Assistant',
+        'assistant panel label': 'Assistant',
       },
     },
   },

package/src/types/types.ts

@@ -12,13 +12,11 @@ import type {
 import { type SchemaProvides } from '@dxos/plugin-client';
 import { type PanelProvides } from '@dxos/plugin-deck/types';
 
-import { AUTOMATION_PLUGIN } from '../meta';
+// import { AUTOMATION_PLUGIN } from '../meta';
 
-const AUTOMATION_ACTION = `${AUTOMATION_PLUGIN}/action`;
+// const AUTOMATION_ACTION = `${AUTOMATION_PLUGIN}/action`;
 
-export enum AutomationAction {
-  CREATE = `${AUTOMATION_ACTION}/create`,
-}
+export enum AutomationAction {}
 
 export type AutomationPluginProvides = SurfaceProvides &
   IntentResolverProvides &

package/dist/lib/browser/PromptContainer-6CBNCUKQ.mjs

@@ -1,19 +0,0 @@
-import {
-  PromptEditor
-} from "./chunk-CJMV64XO.mjs";
-import "./chunk-B3Z4NQC2.mjs";
-import "./chunk-PQLGYMNY.mjs";
-
-// packages/plugins/experimental/plugin-automation/src/components/PromptContainer.tsx
-import React from "react";
-var PromptContainer = (props) => {
-  return /* @__PURE__ */ React.createElement("div", {
-    role: "none",
-    className: "row-span-2 pli-2"
-  }, /* @__PURE__ */ React.createElement(PromptEditor, props));
-};
-var PromptContainer_default = PromptContainer;
-export {
-  PromptContainer_default as default
-};
-//# sourceMappingURL=PromptContainer-6CBNCUKQ.mjs.map

package/dist/lib/browser/PromptContainer-6CBNCUKQ.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/PromptContainer.tsx"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport React from 'react';\n\nimport { PromptEditor, type PromptEditorProps } from './PromptEditor';\n\ntype PromptContainerProps = PromptEditorProps;\n\nconst PromptContainer = (props: PromptContainerProps) => {\n  return (\n    <div role='none' className='row-span-2 pli-2'>\n      <PromptEditor {...props} />\n    </div>\n  );\n};\n\nexport default PromptContainer;\n"],
-  "mappings": ";;;;;;;AAIA,OAAOA,WAAW;AAMlB,IAAMC,kBAAkB,CAACC,UAAAA;AACvB,SACE,sBAAA,cAACC,OAAAA;IAAIC,MAAK;IAAOC,WAAU;KACzB,sBAAA,cAACC,cAAiBJ,KAAAA,CAAAA;AAGxB;AAEA,IAAA,0BAAeD;",
-  "names": ["React", "PromptContainer", "props", "div", "role", "className", "PromptEditor"]
-}