Enforce strict Effect tsgo migrations

ts/packages/flow/src/query/embeddings/qdrant-doc-service.ts

@@ -101,7 +101,7 @@ export function makeDocEmbeddingsQueryService(config: ProcessorConfig): DocEmbed
         ),
       ),
   });
-  console.log("[DocEmbeddingsQuery] Service initialized");
+  Effect.runSync(Effect.log("[DocEmbeddingsQuery] Service initialized"));
   return service;
 }
 
@@ -113,6 +113,6 @@ export const program = makeFlowProcessorProgram<ProcessorConfig & QdrantDocQuery
   layer: (config) => QdrantDocEmbeddingsQueryLive(config),
 });
 
-export async function run(): Promise<void> {
-  await Effect.runPromise(program);
+export function run(): Promise<void> {
+  return Effect.runPromise(program);
 }

ts/packages/flow/src/query/embeddings/qdrant-doc.ts

@@ -9,7 +9,8 @@
 
 import { QdrantClient } from "@qdrant/js-client-rest";
 import { errorMessage } from "@trustgraph/base";
-import { Context, Effect, Layer } from "effect";
+import { Config, Context, Effect, Layer } from "effect";
+import * as O from "effect/Option";
 import * as S from "effect/Schema";
 
 export interface QdrantDocQueryConfig {
@@ -30,24 +31,58 @@ export interface DocEmbeddingsQueryRequest {
   limit: number;
 }
 
+export class QdrantDocEmbeddingsQueryError extends S.TaggedErrorClass<QdrantDocEmbeddingsQueryError>()(
+  "QdrantDocEmbeddingsQueryError",
+  {
+    message: S.String,
+    operation: S.String,
+    cause: S.DefectWithStack,
+  },
+) {}
+
+const qdrantDocEmbeddingsQueryError = (operation: string, cause: unknown) =>
+  QdrantDocEmbeddingsQueryError.make({
+    operation,
+    message: errorMessage(cause),
+    cause,
+  });
+
+interface ResolvedQdrantDocQueryConfig {
+  readonly url: string;
+  readonly apiKey?: string;
+}
+
+const loadQdrantDocQueryConfig = Effect.fn("QdrantDocEmbeddingsQuery.loadConfig")(function* (
+  config: QdrantDocQueryConfig,
+) {
+  const envApiKey = O.getOrUndefined(yield* Config.string("QDRANT_API_KEY").pipe(Config.option));
+  const apiKey = config.apiKey ?? envApiKey;
+  return {
+    url: config.url ?? (yield* Config.string("QDRANT_URL").pipe(Config.withDefault("http://localhost:6333"))),
+    ...(apiKey !== undefined && apiKey.length > 0 ? { apiKey } : {}),
+  } satisfies ResolvedQdrantDocQueryConfig;
+});
+
 export interface QdrantDocEmbeddingsQuery {
   readonly query: (request: DocEmbeddingsQueryRequest) => Promise<ChunkMatch[]>;
+  readonly queryEffect: (
+    request: DocEmbeddingsQueryRequest,
+  ) => Effect.Effect<ReadonlyArray<ChunkMatch>, QdrantDocEmbeddingsQueryError>;
 }
 
 export function makeQdrantDocEmbeddingsQuery(
   config: QdrantDocQueryConfig = {},
 ): QdrantDocEmbeddingsQuery {
-  const url = config.url ?? process.env.QDRANT_URL ?? "http://localhost:6333";
-  const apiKey = config.apiKey ?? process.env.QDRANT_API_KEY;
+  const resolved = Effect.runSync(loadQdrantDocQueryConfig(config));
 
   const client = new QdrantClient({
-    url,
-    ...(apiKey !== undefined && apiKey.length > 0 ? { apiKey } : {}),
+    url: resolved.url,
+    ...(resolved.apiKey !== undefined ? { apiKey: resolved.apiKey } : {}),
   });
 
-  console.log("[QdrantDocQuery] Query service initialized");
+  Effect.runSync(Effect.log("[QdrantDocQuery] Query service initialized"));
 
-  const query = async (request: DocEmbeddingsQueryRequest): Promise<ChunkMatch[]> => {
+  const queryEffect = Effect.fn("QdrantDocEmbeddingsQuery.query")(function* (request: DocEmbeddingsQueryRequest) {
     const { vector, user, collection, limit } = request;
 
     if (vector.length === 0) {
@@ -58,18 +93,25 @@ export function makeQdrantDocEmbeddingsQuery(
     const collectionName = `d_${user}_${collection}_${dim}`;
 
     // Check if collection exists -- return empty if not
-    const exists = await client.collectionExists(collectionName);
+    const exists = yield* Effect.tryPromise({
+      try: () => client.collectionExists(collectionName),
+      catch: (cause) => qdrantDocEmbeddingsQueryError("collection-exists", cause),
+    });
     if (!exists.exists) {
-      console.log(
+      yield* Effect.log(
         `[QdrantDocQuery] Collection ${collectionName} does not exist, returning empty results`,
       );
       return [];
     }
 
-    const searchResult = await client.search(collectionName, {
-      vector,
-      limit,
-      with_payload: true,
+    const searchResult = yield* Effect.tryPromise({
+      try: () =>
+        client.search(collectionName, {
+          vector,
+          limit,
+          with_payload: true,
+        }),
+      catch: (cause) => qdrantDocEmbeddingsQueryError("search", cause),
     });
 
     const chunks: ChunkMatch[] = [];
@@ -86,20 +128,14 @@ export function makeQdrantDocEmbeddingsQuery(
     }
 
     return chunks;
+  });
+
+  return {
+    query: (request) => Effect.runPromise(queryEffect(request)),
+    queryEffect,
   };
-
-  return { query };
 }
 
-export class QdrantDocEmbeddingsQueryError extends S.TaggedErrorClass<QdrantDocEmbeddingsQueryError>()(
-  "QdrantDocEmbeddingsQueryError",
-  {
-    message: S.String,
-    operation: S.String,
-    cause: S.DefectWithStack,
-  },
-) {}
-
 export interface QdrantDocEmbeddingsQueryServiceShape {
   readonly query: (
     request: DocEmbeddingsQueryRequest,
@@ -113,24 +149,12 @@ export class QdrantDocEmbeddingsQueryService extends Context.Service<
   "@trustgraph/flow/query/embeddings/qdrant-doc/QdrantDocEmbeddingsQueryService",
 ) {}
 
-const qdrantDocEmbeddingsQueryError = (operation: string, cause: unknown) =>
-  new QdrantDocEmbeddingsQueryError({
-    operation,
-    message: errorMessage(cause),
-    cause,
-  });
-
 export const makeQdrantDocEmbeddingsQueryService = (
   config: QdrantDocQueryConfig = {},
 ): QdrantDocEmbeddingsQueryServiceShape => {
   const query = makeQdrantDocEmbeddingsQuery(config);
   return {
-    query: Effect.fn("QdrantDocEmbeddingsQuery.query")(function* (request) {
-      return yield* Effect.tryPromise({
-        try: () => query.query(request),
-        catch: (cause) => qdrantDocEmbeddingsQueryError("query", cause),
-      });
-    }),
+    query: query.queryEffect,
   };
 };
 

ts/packages/flow/src/query/embeddings/qdrant-graph-service.ts

@@ -102,7 +102,7 @@ export function makeGraphEmbeddingsQueryService(config: ProcessorConfig): GraphE
         ),
       ),
   });
-  console.log("[GraphEmbeddingsQuery] Service initialized");
+  Effect.runSync(Effect.log("[GraphEmbeddingsQuery] Service initialized"));
   return service;
 }
 
@@ -114,6 +114,6 @@ export const program = makeFlowProcessorProgram<ProcessorConfig & QdrantGraphQue
   layer: (config) => QdrantGraphEmbeddingsQueryLive(config),
 });
 
-export async function run(): Promise<void> {
-  await Effect.runPromise(program);
+export function run(): Promise<void> {
+  return Effect.runPromise(program);
 }

ts/packages/flow/src/query/embeddings/qdrant-graph.ts

@@ -12,7 +12,8 @@
 
 import { QdrantClient } from "@qdrant/js-client-rest";
 import { errorMessage, type Term } from "@trustgraph/base";
-import { Context, Effect, Layer } from "effect";
+import { Config, Context, Effect, Layer } from "effect";
+import * as O from "effect/Option";
 import * as S from "effect/Schema";
 
 export interface QdrantGraphQueryConfig {
@@ -32,6 +33,38 @@ export interface GraphEmbeddingsQueryRequest {
   limit: number;
 }
 
+export class QdrantGraphEmbeddingsQueryError extends S.TaggedErrorClass<QdrantGraphEmbeddingsQueryError>()(
+  "QdrantGraphEmbeddingsQueryError",
+  {
+    message: S.String,
+    operation: S.String,
+    cause: S.DefectWithStack,
+  },
+) {}
+
+const qdrantGraphEmbeddingsQueryError = (operation: string, cause: unknown) =>
+  QdrantGraphEmbeddingsQueryError.make({
+    operation,
+    message: errorMessage(cause),
+    cause,
+  });
+
+interface ResolvedQdrantGraphQueryConfig {
+  readonly url: string;
+  readonly apiKey?: string;
+}
+
+const loadQdrantGraphQueryConfig = Effect.fn("QdrantGraphEmbeddingsQuery.loadConfig")(function* (
+  config: QdrantGraphQueryConfig,
+) {
+  const envApiKey = O.getOrUndefined(yield* Config.string("QDRANT_API_KEY").pipe(Config.option));
+  const apiKey = config.apiKey ?? envApiKey;
+  return {
+    url: config.url ?? (yield* Config.string("QDRANT_URL").pipe(Config.withDefault("http://localhost:6333"))),
+    ...(apiKey !== undefined && apiKey.length > 0 ? { apiKey } : {}),
+  } satisfies ResolvedQdrantGraphQueryConfig;
+});
+
 function createTerm(value: string): Term {
   if (value.startsWith("http://") || value.startsWith("https://")) {
     return { type: "IRI", iri: value };
@@ -41,22 +74,26 @@ function createTerm(value: string): Term {
 
 export interface QdrantGraphEmbeddingsQuery {
   readonly query: (request: GraphEmbeddingsQueryRequest) => Promise<EntityMatch[]>;
+  readonly queryEffect: (
+    request: GraphEmbeddingsQueryRequest,
+  ) => Effect.Effect<ReadonlyArray<EntityMatch>, QdrantGraphEmbeddingsQueryError>;
 }
 
 export function makeQdrantGraphEmbeddingsQuery(
   config: QdrantGraphQueryConfig = {},
 ): QdrantGraphEmbeddingsQuery {
-  const url = config.url ?? process.env.QDRANT_URL ?? "http://localhost:6333";
-  const apiKey = config.apiKey ?? process.env.QDRANT_API_KEY;
+  const resolved = Effect.runSync(loadQdrantGraphQueryConfig(config));
 
   const client = new QdrantClient({
-    url,
-    ...(apiKey !== undefined && apiKey.length > 0 ? { apiKey } : {}),
+    url: resolved.url,
+    ...(resolved.apiKey !== undefined ? { apiKey: resolved.apiKey } : {}),
   });
 
-  console.log("[QdrantGraphQuery] Query service initialized");
+  Effect.runSync(Effect.log("[QdrantGraphQuery] Query service initialized"));
 
-  const query = async (request: GraphEmbeddingsQueryRequest): Promise<EntityMatch[]> => {
+  const queryEffect = Effect.fn("QdrantGraphEmbeddingsQuery.query")(function* (
+    request: GraphEmbeddingsQueryRequest,
+  ) {
     const { vector, user, collection, limit } = request;
 
     if (vector.length === 0) {
@@ -67,9 +104,12 @@ export function makeQdrantGraphEmbeddingsQuery(
     const collectionName = `t_${user}_${collection}_${dim}`;
 
     // Check if collection exists -- return empty if not
-    const exists = await client.collectionExists(collectionName);
+    const exists = yield* Effect.tryPromise({
+      try: () => client.collectionExists(collectionName),
+      catch: (cause) => qdrantGraphEmbeddingsQueryError("collection-exists", cause),
+    });
     if (!exists.exists) {
-      console.log(
+      yield* Effect.log(
         `[QdrantGraphQuery] Collection ${collectionName} does not exist, returning empty results`,
       );
       return [];
@@ -77,10 +117,14 @@ export function makeQdrantGraphEmbeddingsQuery(
 
     // Query 2x the limit so we have a better chance of getting `limit`
     // unique entities after deduplication (same heuristic as Python impl)
-    const searchResult = await client.search(collectionName, {
-      vector,
-      limit: limit * 2,
-      with_payload: true,
+    const searchResult = yield* Effect.tryPromise({
+      try: () =>
+        client.search(collectionName, {
+          vector,
+          limit: limit * 2,
+          with_payload: true,
+        }),
+      catch: (cause) => qdrantGraphEmbeddingsQueryError("search", cause),
     });
 
     const entitySet = new Set<string>();
@@ -106,20 +150,14 @@ export function makeQdrantGraphEmbeddingsQuery(
     }
 
     return entities;
+  });
+
+  return {
+    query: (request) => Effect.runPromise(queryEffect(request)),
+    queryEffect,
   };
-
-  return { query };
 }
 
-export class QdrantGraphEmbeddingsQueryError extends S.TaggedErrorClass<QdrantGraphEmbeddingsQueryError>()(
-  "QdrantGraphEmbeddingsQueryError",
-  {
-    message: S.String,
-    operation: S.String,
-    cause: S.DefectWithStack,
-  },
-) {}
-
 export interface QdrantGraphEmbeddingsQueryServiceShape {
   readonly query: (
     request: GraphEmbeddingsQueryRequest,
@@ -133,24 +171,12 @@ export class QdrantGraphEmbeddingsQueryService extends Context.Service<
   "@trustgraph/flow/query/embeddings/qdrant-graph/QdrantGraphEmbeddingsQueryService",
 ) {}
 
-const qdrantGraphEmbeddingsQueryError = (operation: string, cause: unknown) =>
-  new QdrantGraphEmbeddingsQueryError({
-    operation,
-    message: errorMessage(cause),
-    cause,
-  });
-
 export const makeQdrantGraphEmbeddingsQueryService = (
   config: QdrantGraphQueryConfig = {},
 ): QdrantGraphEmbeddingsQueryServiceShape => {
   const query = makeQdrantGraphEmbeddingsQuery(config);
   return {
-    query: Effect.fn("QdrantGraphEmbeddingsQuery.query")(function* (request) {
-      return yield* Effect.tryPromise({
-        try: () => query.query(request),
-        catch: (cause) => qdrantGraphEmbeddingsQueryError("query", cause),
-      });
-    }),
+    query: query.queryEffect,
   };
 };