#15-fix to process and, or operator

Author: zho

src/server/metadata-filter.ts

@@ -9,6 +9,7 @@ const metadataFilterValueSchema: z.ZodType<unknown> = z.lazy(() =>
     z.boolean(),
     z.array(z.string()),
     z.array(z.number()),
+    z.array(z.lazy(() => metadataFilterSchema)),
     z.record(z.string(), metadataFilterValueSchema), // Recursive for nested operators
   ])
 );
@@ -23,6 +24,8 @@ const ALLOWED_FILTER_OPERATORS = new Set([
   '$lte',
   '$in',
   '$nin',
+  '$and',
+  '$or',
 ]);
 
 /** True if value is a string, number, or boolean (allowed for $eq, $gt, etc.). */
@@ -45,7 +48,17 @@ function validateMetadataFilterValue(value: unknown, path: string[]): string | n
     return null;
   }
 
-  if (typeof value !== 'object' || Array.isArray(value)) {
+  if (Array.isArray(value)) {
+    for (let i = 0; i < value.length; i++) {
+      const parsed = metadataFilterSchema.safeParse(value[i]);
+      if (!parsed.success) {
+        return `Operator "${path[path.length - 1]}" at "${path.join('.')}" must use an array of filter objects.`;
+      }
+    }
+    return null;
+  }
+
+  if (typeof value !== 'object') {
     return `Unsupported filter value at "${path.join('.')}".`;
   }
 
@@ -70,6 +83,9 @@ function validateMetadataFilterValue(value: unknown, path: string[]): string | n
     ) {
       return `Operator "${key}" at "${path.join('.')}" must use a primitive value.`;
     }
+    if ((key === '$and' || key === '$or') && !Array.isArray(nestedValue)) {
+      return `Operator "${key}" at "${path.join('.')}" must use an array of filter objects.`;
+    }
 
     const nestedError = validateMetadataFilterValue(nestedValue, [...path, key]);
     if (nestedError) {

src/server/namespace-router.ts

@@ -1,6 +1,6 @@
 import type { NamespaceInfo } from './namespaces-cache.js';
 
-type RankedNamespace = {
+export type RankedNamespace = {
   namespace: string;
   score: number;
   record_count: number;
@@ -28,7 +28,7 @@ function scoreNamespace(
     score += 3;
     reasons.push('query mentions namespace name');
   } else {
-    const nameTokens = normalizedName.split(/\s+/).filter(Boolean);
+    const nameTokens = [...new Set(normalizedName.split(/\s+/).filter(Boolean))];
     for (const token of nameTokens) {
       if (token.length >= 2 && q.includes(token)) {
         score += 2;
@@ -56,7 +56,7 @@ export function rankNamespacesByQuery(
   namespaces: NamespaceInfo[],
   topN: number
 ): RankedNamespace[] {
-  const limit = Math.max(1, Math.floor(topN));
+  const limit = Number.isFinite(topN) ? Math.max(1, Math.floor(topN)) : 1;
   return namespaces
     .map((ns) => {
       const fields = Object.keys(ns.metadata ?? {});