@dxos/assistant-toolkit 0.8.4-main.548089c → 0.8.4-main.70d3990

package/dist/lib/browser/index.mjs

@@ -392,13 +392,12 @@ import * as Function3 from "effect/Function";
 import * as Option3 from "effect/Option";
 import * as Schema5 from "effect/Schema";
 import * as SchemaAST from "effect/SchemaAST";
-import { Obj as Obj3 } from "@dxos/echo";
-import { Filter, Query } from "@dxos/echo";
-import { EntityKind, ObjectId, ReferenceAnnotationId, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, create, getEntityKind, getSchemaDXN, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation } from "@dxos/echo/internal";
+import { Entity, Filter, Obj as Obj3, Query, Type as Type2 } from "@dxos/echo";
+import { ReferenceAnnotationId, RelationSourceDXNId, RelationSourceId, RelationTargetDXNId, RelationTargetId, createObject, getTypeAnnotation, getTypeIdentifierAnnotation } from "@dxos/echo/internal";
 import { isEncodedReference } from "@dxos/echo-protocol";
 import { mapAst } from "@dxos/effect";
 import { ContextQueueService, DatabaseService as DatabaseService4 } from "@dxos/functions";
-import { DXN } from "@dxos/keys";
+import { DXN, ObjectId } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { deepMapValues, isNonNullable, trim } from "@dxos/util";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/core/assistant-toolkit/src/crud/graph.ts";
@@ -411,7 +410,7 @@ var findRelatedSchema = async (db, anchor) => {
     ...db.graph.schemaRegistry.schemas
   ];
   return allSchemas.filter((schema) => {
-    if (getTypeAnnotation(schema)?.kind !== EntityKind.Relation) {
+    if (getTypeAnnotation(schema)?.kind !== Entity.Kind.Relation) {
       return false;
     }
     return isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).sourceSchema)) || isSchemaAddressableByDxn(anchor, DXN.parse(getTypeAnnotation(schema).targetSchema));
@@ -426,7 +425,7 @@ var isSchemaAddressableByDxn = (schema, dxn) => {
   }
   const t = dxn.asTypeDXN();
   if (t) {
-    return t.type === getSchemaTypename(schema);
+    return t.type === Type2.getTypename(schema);
   }
   return false;
 };
@@ -498,13 +497,13 @@ var createExtractionSchema = (types) => {
     ...Object.fromEntries(types.map(preprocessSchema).map((schema, index) => [
       `objects_${getSanitizedSchemaName(types[index])}`,
       Schema5.optional(Schema5.Array(schema)).annotations({
-        description: `The objects of type: ${getSchemaDXN(types[index])?.asTypeDXN().type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option3.getOrElse(() => ""))}`
+        description: `The objects of type: ${Type2.getDXN(types[index])?.asTypeDXN().type}. ${SchemaAST.getDescriptionAnnotation(types[index].ast).pipe(Option3.getOrElse(() => ""))}`
       })
     ]))
   });
 };
 var getSanitizedSchemaName = (schema) => {
-  return getSchemaDXN(schema).asTypeDXN().type.replaceAll(/[^a-zA-Z0-9]+/g, "_");
+  return Type2.getDXN(schema).asTypeDXN().type.replaceAll(/[^a-zA-Z0-9]+/g, "_");
 };
 var sanitizeObjects = async (types, data, db, queue) => {
   const entries = types.map((type) => data[`objects_${getSanitizedSchemaName(type)}`]?.map((object) => ({
@@ -549,14 +548,14 @@ var sanitizeObjects = async (types, data, db, queue) => {
       }
       return recurse(value2);
     });
-    if (getEntityKind(entry.schema) === "relation") {
+    if (Entity.getKind(entry.schema) === "relation") {
       const sourceDxn = resolveId(data2.source);
       if (!sourceDxn) {
         log3.warn("source not found", {
           source: data2.source
         }, {
           F: __dxlog_file3,
-          L: 281,
+          L: 275,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -567,7 +566,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
           target: data2.target
         }, {
           F: __dxlog_file3,
-          L: 285,
+          L: 279,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -596,7 +595,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
     existingIds
   }, {
     F: __dxlog_file3,
-    L: 306,
+    L: 300,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -627,7 +626,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
       }
     }
     if (!skip) {
-      const obj = create(schema, data2);
+      const obj = createObject(schema, data2);
       enitties.set(obj.id, obj);
       return [
         obj
@@ -642,7 +641,7 @@ var SoftRef = Schema5.Struct({
   description: "Reference to another object."
 });
 var preprocessSchema = (schema) => {
-  const isRelationSchema = getEntityKind(schema) === "relation";
+  const isRelationSchema = Entity.getKind(schema) === "relation";
   const go = (ast, visited = /* @__PURE__ */ new Set()) => {
     if (visited.has(ast)) {
       return ast;
@@ -1362,15 +1361,16 @@ var levenshteinDistance = (str1, str2) => {
 import * as Effect9 from "effect/Effect";
 import * as Layer2 from "effect/Layer";
 import * as Schema9 from "effect/Schema";
-import { Obj as Obj5, Query as Query2, Ref as Ref2, Type as Type2 } from "@dxos/echo";
+import { Obj as Obj5, Query as Query2, Ref as Ref2, Type as Type3 } from "@dxos/echo";
+import { SystemTypeAnnotation } from "@dxos/echo/internal";
 import { Queue } from "@dxos/echo-db";
 import { ContextQueueService as ContextQueueService2, DatabaseService as DatabaseService6, QueueService } from "@dxos/functions";
 var ResearchGraph = Schema9.Struct({
-  queue: Type2.Ref(Queue)
-}).pipe(Type2.Obj({
+  queue: Type3.Ref(Queue)
+}).pipe(Type3.Obj({
   typename: "dxos.org/type/ResearchGraph",
   version: "0.1.0"
-}));
+}), SystemTypeAnnotation.set(true));
 var queryResearchGraph = Effect9.fn("queryResearchGraph")(function* () {
   const { objects } = yield* DatabaseService6.runQuery(Query2.type(ResearchGraph));
   return objects.at(0);
@@ -1564,8 +1564,9 @@ var entity_extraction_default = defineFunction9({
       description: "Extracted entities."
     }))
   }),
-  handler: Effect11.fnUntraced(function* ({ data: { source, instructions: instructions6 } }) {
-    const contact = yield* extractContact(source);
+  handler: Effect11.fnUntraced(function* ({ data: { source: message, instructions: instructions6 } }) {
+    const tags = Obj7.getMeta(message)?.tags;
+    const contact = yield* extractContact(message.sender, tags);
     let organization = null;
     if (contact && !contact.organization) {
       const created = [];
@@ -1585,7 +1586,7 @@ var entity_extraction_default = defineFunction9({
             ${instructions6 ? "<user_intructions>" + instructions6 + "</user_intructions>" : ""},
           `,
         prompt: JSON.stringify({
-          source,
+          source: message,
           contact
         }),
         toolkit
@@ -1595,7 +1596,7 @@ var entity_extraction_default = defineFunction9({
       } else if (created.length === 1) {
         organization = yield* DatabaseService8.resolve(created[0], Organization.Organization);
         Obj7.getMeta(organization).tags ??= [];
-        Obj7.getMeta(organization).tags.push(...Obj7.getMeta(source)?.tags ?? []);
+        Obj7.getMeta(organization).tags.push(...tags ?? []);
         contact.organization = Ref3.make(organization);
       }
     }
@@ -1610,15 +1611,15 @@ var entity_extraction_default = defineFunction9({
     Layer4.mergeAll(FunctionInvocationServiceLayerTest())
   ))))
 });
-var extractContact = Effect11.fn("extractContact")(function* (message) {
-  const name = message.sender.name;
-  const email = message.sender.email;
+var extractContact = Effect11.fn("extractContact")(function* (actor, tags) {
+  const name = actor.name;
+  const email = actor.email;
   if (!email) {
     log5.warn("email is required for contact extraction", {
-      sender: message.sender
+      actor
     }, {
       F: __dxlog_file5,
-      L: 99,
+      L: 100,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1632,7 +1633,7 @@ var extractContact = Effect11.fn("extractContact")(function* (message) {
       existingContact
     }, {
       F: __dxlog_file5,
-      L: 112,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1640,7 +1641,7 @@ var extractContact = Effect11.fn("extractContact")(function* (message) {
   }
   const newContact = Obj7.make(Person2.Person, {
     [Obj7.Meta]: {
-      tags: Obj7.getMeta(message)?.tags
+      tags
     },
     emails: [
       {
@@ -1658,7 +1659,7 @@ var extractContact = Effect11.fn("extractContact")(function* (message) {
       email
     }, {
       F: __dxlog_file5,
-      L: 130,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1668,7 +1669,7 @@ var extractContact = Effect11.fn("extractContact")(function* (message) {
     emailDomain
   }, {
     F: __dxlog_file5,
-    L: 134,
+    L: 133,
     S: this,
     C: (f, a) => f(...a)
   });
@@ -1685,7 +1686,7 @@ var extractContact = Effect11.fn("extractContact")(function* (message) {
           error: e
         }, {
           F: __dxlog_file5,
-          L: 152,
+          L: 151,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1699,7 +1700,7 @@ var extractContact = Effect11.fn("extractContact")(function* (message) {
       organization: matchingOrg
     }, {
       F: __dxlog_file5,
-      L: 160,
+      L: 159,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2429,11 +2430,11 @@ var websearch_default = websearch_blueprint_default;
 import * as Schema15 from "effect/Schema";
 import React from "react";
 import { Capabilities, contributes, createSurface } from "@dxos/app-framework";
-import { Type as Type3 } from "@dxos/echo";
+import { Format, Type as Type4 } from "@dxos/echo";
 import { JsonFilter } from "@dxos/react-ui-syntax-highlighter";
 var MapSchema = Schema15.Struct({
-  coordinates: Type3.Format.GeoPoint
-}).pipe(Type3.Obj({
+  coordinates: Format.GeoPoint
+}).pipe(Type4.Obj({
   typename: "example.com/type/Map",
   version: "0.1.0"
 }));
@@ -2522,7 +2523,7 @@ import * as Effect17 from "effect/Effect";
 import * as Record2 from "effect/Record";
 import * as Schema17 from "effect/Schema";
 import { ArtifactId as ArtifactId7 } from "@dxos/assistant";
-import { DXN as DXN2, Obj as Obj16, Relation as Relation2, Tag as Tag2, Type as Type4 } from "@dxos/echo";
+import { DXN as DXN2, Obj as Obj16, Relation as Relation2, Tag as Tag2, Type as Type5 } from "@dxos/echo";
 import { DatabaseService as DatabaseService14 } from "@dxos/functions";
 import { trim as trim11 } from "@dxos/util";
 var SystemToolkit = Toolkit6.make(
@@ -2673,10 +2674,10 @@ var layer4 = () => SystemToolkit.toLayer({
       ]
     }).run());
     return schema.map((schema2) => {
-      const meta = Type4.getMeta(schema2);
+      const meta = Type5.getMeta(schema2);
       return {
-        typename: Type4.getTypename(schema2),
-        jsonSchema: Type4.toJsonSchema(schema2),
+        typename: Type5.getTypename(schema2),
+        jsonSchema: Type5.toJsonSchema(schema2),
         kind: meta?.sourceSchema ? "relation" : "record"
       };
     });