@neutrome/open-ai-router 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neutrome/open-ai-router",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "exports": {
     ".": "./src/index.ts"

package/src/router/execute.ts

@@ -114,9 +114,6 @@ export function createRouterExecutionRuntime(
   if (options.executors) {
     runtimeOptions.executors = options.executors;
   }
-  if (options.resolveExecutor) {
-    runtimeOptions.resolveExecutor = options.resolveExecutor;
-  }
   if (options.transforms) {
     runtimeOptions.transforms = options.transforms;
   }
@@ -130,9 +127,41 @@ export function createRouterExecutionRuntime(
     runtimeOptions.executionIdFactory = options.executionIdFactory;
   }
 
+  const userResolveExecutor = options.resolveExecutor;
+  runtimeOptions.resolveExecutor = (name) => {
+    if (userResolveExecutor) {
+      const result = userResolveExecutor(name);
+      if (result) return result;
+    }
+    return resolveNamespaceExecutor(runtime, name);
+  };
+
   return createExecutionRuntime(runtimeOptions);
 }
 
+function resolveNamespaceExecutor(
+  runtime: RouterRuntime,
+  name: string,
+): Executor | null {
+  const executor = runtime.executors.get(name);
+  if (!executor) return null;
+
+  return {
+    async execute(request, ctx) {
+      const model = getModel(request);
+      if (!model) throw new ExecutionError("resolution", "Request is missing model for namespace executor resolution", { stage: "target_resolution" });
+      const resolved = resolveInvocationTarget(runtime, `${name}/${model}`);
+      return ctx.invoke(request, { target: resolved.target });
+    },
+    async *stream(request, ctx) {
+      const model = getModel(request);
+      if (!model) throw new ExecutionError("resolution", "Request is missing model for namespace executor resolution", { stage: "target_resolution" });
+      const resolved = resolveInvocationTarget(runtime, `${name}/${model}`);
+      yield* ctx.invokeStream(request, { target: resolved.target });
+    },
+  };
+}
+
 export async function handleChatCompletions(
   options: HandleChatCompletionsOptions,
 ): Promise<Response> {