Remove native classes from TS runtime

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

@@ -8,10 +8,11 @@
  */
 
 import {
-  FlowProcessor,
-  ConsumerSpec,
-  ProducerSpec,
+  makeFlowProcessor,
+  makeConsumerSpec,
+  makeProducerSpec,
   type ProcessorConfig,
+  type FlowProcessorRuntime,
   type FlowContext,
   type FlowResourceNotFoundError,
   type MessagingDeliveryError,
@@ -78,37 +79,34 @@ const onDocEmbeddingsQueryMessage = Effect.fn("DocEmbeddingsQueryService.onMessa
 });
 
 export const makeDocEmbeddingsQuerySpecs = (): ReadonlyArray<Spec<QdrantDocEmbeddingsQueryService>> => [
-  new ConsumerSpec<
+  makeConsumerSpec<
     DocumentEmbeddingsRequest,
     FlowResourceNotFoundError | MessagingDeliveryError,
     QdrantDocEmbeddingsQueryService
   >("document-embeddings-request", onDocEmbeddingsQueryMessage),
-  new ProducerSpec<DocumentEmbeddingsResponse>("document-embeddings-response"),
+  makeProducerSpec<DocumentEmbeddingsResponse>("document-embeddings-response"),
 ];
 
-export class DocEmbeddingsQueryService extends FlowProcessor<QdrantDocEmbeddingsQueryService> {
-  private readonly query = makeQdrantDocEmbeddingsQueryService();
+export type DocEmbeddingsQueryService = FlowProcessorRuntime<QdrantDocEmbeddingsQueryService>;
 
-  constructor(config: ProcessorConfig) {
-    super(config);
-
-    for (const spec of makeDocEmbeddingsQuerySpecs()) {
-      this.registerSpecification(spec);
-    }
-
-    console.log("[DocEmbeddingsQuery] Service initialized");
-  }
-
-  override startEffect() {
-    return super.startEffect().pipe(
-      Effect.provideService(
-        QdrantDocEmbeddingsQueryService,
-        QdrantDocEmbeddingsQueryService.of(this.query),
+export function makeDocEmbeddingsQueryService(config: ProcessorConfig): DocEmbeddingsQueryService {
+  const query = makeQdrantDocEmbeddingsQueryService();
+  const service = makeFlowProcessor(config, {
+    specifications: makeDocEmbeddingsQuerySpecs(),
+    provide: (effect) =>
+      effect.pipe(
+        Effect.provideService(
+          QdrantDocEmbeddingsQueryService,
+          QdrantDocEmbeddingsQueryService.of(query),
+        ),
       ),
-    );
-  }
+  });
+  console.log("[DocEmbeddingsQuery] Service initialized");
+  return service;
 }
 
+export const DocEmbeddingsQueryService = makeDocEmbeddingsQueryService;
+
 export const program = makeFlowProcessorProgram<ProcessorConfig & QdrantDocQueryConfig, never, QdrantDocEmbeddingsQueryService>({
   id: "doc-embeddings-query",
   specs: () => makeDocEmbeddingsQuerySpecs(),

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

@@ -30,22 +30,24 @@ export interface DocEmbeddingsQueryRequest {
   limit: number;
 }
 
-export class QdrantDocEmbeddingsQuery {
-  private client: QdrantClient;
+export interface QdrantDocEmbeddingsQuery {
+  readonly query: (request: DocEmbeddingsQueryRequest) => Promise<ChunkMatch[]>;
+}
 
-  constructor(config: QdrantDocQueryConfig = {}) {
-    const url = config.url ?? process.env.QDRANT_URL ?? "http://localhost:6333";
-    const apiKey = config.apiKey ?? process.env.QDRANT_API_KEY;
+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;
 
-    this.client = new QdrantClient({
-      url,
-      ...(apiKey !== undefined && apiKey.length > 0 ? { apiKey } : {}),
-    });
+  const client = new QdrantClient({
+    url,
+    ...(apiKey !== undefined && apiKey.length > 0 ? { apiKey } : {}),
+  });
 
-    console.log("[QdrantDocQuery] Query service initialized");
-  }
+  console.log("[QdrantDocQuery] Query service initialized");
 
-  async query(request: DocEmbeddingsQueryRequest): Promise<ChunkMatch[]> {
+  const query = async (request: DocEmbeddingsQueryRequest): Promise<ChunkMatch[]> => {
     const { vector, user, collection, limit } = request;
 
     if (vector.length === 0) {
@@ -56,7 +58,7 @@ export class QdrantDocEmbeddingsQuery {
     const collectionName = `d_${user}_${collection}_${dim}`;
 
     // Check if collection exists -- return empty if not
-    const exists = await this.client.collectionExists(collectionName);
+    const exists = await client.collectionExists(collectionName);
     if (!exists.exists) {
       console.log(
         `[QdrantDocQuery] Collection ${collectionName} does not exist, returning empty results`,
@@ -64,7 +66,7 @@ export class QdrantDocEmbeddingsQuery {
       return [];
     }
 
-    const searchResult = await this.client.search(collectionName, {
+    const searchResult = await client.search(collectionName, {
       vector,
       limit,
       with_payload: true,
@@ -84,7 +86,9 @@ export class QdrantDocEmbeddingsQuery {
     }
 
     return chunks;
-  }
+  };
+
+  return { query };
 }
 
 export class QdrantDocEmbeddingsQueryError extends S.TaggedErrorClass<QdrantDocEmbeddingsQueryError>()(
@@ -119,7 +123,7 @@ const qdrantDocEmbeddingsQueryError = (operation: string, cause: unknown) =>
 export const makeQdrantDocEmbeddingsQueryService = (
   config: QdrantDocQueryConfig = {},
 ): QdrantDocEmbeddingsQueryServiceShape => {
-  const query = new QdrantDocEmbeddingsQuery(config);
+  const query = makeQdrantDocEmbeddingsQuery(config);
   return {
     query: Effect.fn("QdrantDocEmbeddingsQuery.query")(function* (request) {
       return yield* Effect.tryPromise({

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

@@ -8,10 +8,11 @@
  */
 
 import {
-  FlowProcessor,
-  ConsumerSpec,
-  ProducerSpec,
+  makeFlowProcessor,
+  makeConsumerSpec,
+  makeProducerSpec,
   type ProcessorConfig,
+  type FlowProcessorRuntime,
   type FlowContext,
   type FlowResourceNotFoundError,
   type MessagingDeliveryError,
@@ -79,37 +80,34 @@ const onGraphEmbeddingsQueryMessage = Effect.fn("GraphEmbeddingsQueryService.onM
 });
 
 export const makeGraphEmbeddingsQuerySpecs = (): ReadonlyArray<Spec<QdrantGraphEmbeddingsQueryService>> => [
-  new ConsumerSpec<
+  makeConsumerSpec<
     GraphEmbeddingsRequest,
     FlowResourceNotFoundError | MessagingDeliveryError,
     QdrantGraphEmbeddingsQueryService
   >("graph-embeddings-request", onGraphEmbeddingsQueryMessage),
-  new ProducerSpec<GraphEmbeddingsResponse>("graph-embeddings-response"),
+  makeProducerSpec<GraphEmbeddingsResponse>("graph-embeddings-response"),
 ];
 
-export class GraphEmbeddingsQueryService extends FlowProcessor<QdrantGraphEmbeddingsQueryService> {
-  private readonly query = makeQdrantGraphEmbeddingsQueryService();
+export type GraphEmbeddingsQueryService = FlowProcessorRuntime<QdrantGraphEmbeddingsQueryService>;
 
-  constructor(config: ProcessorConfig) {
-    super(config);
-
-    for (const spec of makeGraphEmbeddingsQuerySpecs()) {
-      this.registerSpecification(spec);
-    }
-
-    console.log("[GraphEmbeddingsQuery] Service initialized");
-  }
-
-  override startEffect() {
-    return super.startEffect().pipe(
-      Effect.provideService(
-        QdrantGraphEmbeddingsQueryService,
-        QdrantGraphEmbeddingsQueryService.of(this.query),
+export function makeGraphEmbeddingsQueryService(config: ProcessorConfig): GraphEmbeddingsQueryService {
+  const query = makeQdrantGraphEmbeddingsQueryService();
+  const service = makeFlowProcessor(config, {
+    specifications: makeGraphEmbeddingsQuerySpecs(),
+    provide: (effect) =>
+      effect.pipe(
+        Effect.provideService(
+          QdrantGraphEmbeddingsQueryService,
+          QdrantGraphEmbeddingsQueryService.of(query),
+        ),
       ),
-    );
-  }
+  });
+  console.log("[GraphEmbeddingsQuery] Service initialized");
+  return service;
 }
 
+export const GraphEmbeddingsQueryService = makeGraphEmbeddingsQueryService;
+
 export const program = makeFlowProcessorProgram<ProcessorConfig & QdrantGraphQueryConfig, never, QdrantGraphEmbeddingsQueryService>({
   id: "graph-embeddings-query",
   specs: () => makeGraphEmbeddingsQuerySpecs(),

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

@@ -39,22 +39,24 @@ function createTerm(value: string): Term {
   return { type: "LITERAL", value };
 }
 
-export class QdrantGraphEmbeddingsQuery {
-  private client: QdrantClient;
+export interface QdrantGraphEmbeddingsQuery {
+  readonly query: (request: GraphEmbeddingsQueryRequest) => Promise<EntityMatch[]>;
+}
 
-  constructor(config: QdrantGraphQueryConfig = {}) {
-    const url = config.url ?? process.env.QDRANT_URL ?? "http://localhost:6333";
-    const apiKey = config.apiKey ?? process.env.QDRANT_API_KEY;
+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;
 
-    this.client = new QdrantClient({
-      url,
-      ...(apiKey !== undefined && apiKey.length > 0 ? { apiKey } : {}),
-    });
+  const client = new QdrantClient({
+    url,
+    ...(apiKey !== undefined && apiKey.length > 0 ? { apiKey } : {}),
+  });
 
-    console.log("[QdrantGraphQuery] Query service initialized");
-  }
+  console.log("[QdrantGraphQuery] Query service initialized");
 
-  async query(request: GraphEmbeddingsQueryRequest): Promise<EntityMatch[]> {
+  const query = async (request: GraphEmbeddingsQueryRequest): Promise<EntityMatch[]> => {
     const { vector, user, collection, limit } = request;
 
     if (vector.length === 0) {
@@ -65,7 +67,7 @@ export class QdrantGraphEmbeddingsQuery {
     const collectionName = `t_${user}_${collection}_${dim}`;
 
     // Check if collection exists -- return empty if not
-    const exists = await this.client.collectionExists(collectionName);
+    const exists = await client.collectionExists(collectionName);
     if (!exists.exists) {
       console.log(
         `[QdrantGraphQuery] Collection ${collectionName} does not exist, returning empty results`,
@@ -75,7 +77,7 @@ export class QdrantGraphEmbeddingsQuery {
 
     // 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 this.client.search(collectionName, {
+    const searchResult = await client.search(collectionName, {
       vector,
       limit: limit * 2,
       with_payload: true,
@@ -104,7 +106,9 @@ export class QdrantGraphEmbeddingsQuery {
     }
 
     return entities;
-  }
+  };
+
+  return { query };
 }
 
 export class QdrantGraphEmbeddingsQueryError extends S.TaggedErrorClass<QdrantGraphEmbeddingsQueryError>()(
@@ -139,7 +143,7 @@ const qdrantGraphEmbeddingsQueryError = (operation: string, cause: unknown) =>
 export const makeQdrantGraphEmbeddingsQueryService = (
   config: QdrantGraphQueryConfig = {},
 ): QdrantGraphEmbeddingsQueryServiceShape => {
-  const query = new QdrantGraphEmbeddingsQuery(config);
+  const query = makeQdrantGraphEmbeddingsQuery(config);
   return {
     query: Effect.fn("QdrantGraphEmbeddingsQuery.query")(function* (request) {
       return yield* Effect.tryPromise({