refactor .withImage to remove confusing couplings

Author: tsmith023

src/graphql/explorer.ts

@@ -1,11 +1,11 @@
 import NearText, { NearTextArgs } from './nearText';
 import NearVector, { NearVectorArgs } from './nearVector';
+import NearImage, { NearImageArgs } from './nearImage';
 import NearObject, { NearObjectArgs } from './nearObject';
 import NearMedia, {
   NearAudioArgs,
   NearDepthArgs,
   NearIMUArgs,
-  NearImageArgs,
   NearMediaArgs,
   NearMediaType,
   NearThermalArgs,
@@ -95,11 +95,17 @@ export default class Explorer extends CommandBase {
   };
 
   withNearImage = (args: NearImageArgs) => {
-    return this.withNearMedia({
-      ...args,
-      media: args.image ? args.image : 'UNSET',
-      type: NearMediaType.Image,
-    });
+    if (this.includesNearMediaFilter) {
+      throw new Error('cannot use multiple near<Media> filters in a single query');
+    }
+    try {
+      this.nearMediaString = new NearImage(args).toString();
+      this.nearMediaType = NearMediaType.Image;
+      this.includesNearMediaFilter = true;
+    } catch (e: any) {
+      this.addError(e.toString());
+    }
+    return this;
   };
 
   withNearAudio = (args: NearAudioArgs) => {

src/graphql/getter.test.ts

@@ -4,7 +4,7 @@ import { NearObjectArgs } from './nearObject';
 import { AskArgs } from './ask';
 import { SortArgs } from './sort';
 import { NearTextArgs } from './nearText';
-import { NearImageArgs, NearMediaType } from './nearMedia';
+import { NearImageArgs } from './nearImage';
 
 test('a simple query without params', () => {
   const mockClient: any = {

src/graphql/getter.ts

@@ -3,12 +3,12 @@ import NearText, { NearTextArgs } from './nearText';
 import NearVector, { NearVectorArgs } from './nearVector';
 import Bm25, { Bm25Args } from './bm25';
 import Hybrid, { HybridArgs } from './hybrid';
+import NearImage, { NearImageArgs } from './nearImage';
 import NearObject, { NearObjectArgs } from './nearObject';
 import NearMedia, {
   NearAudioArgs,
   NearDepthArgs,
   NearIMUArgs,
-  NearImageArgs,
   NearMediaArgs,
   NearMediaType,
   NearThermalArgs,
@@ -159,11 +159,17 @@ export default class GraphQLGetter extends CommandBase {
   };
 
   withNearImage = (args: NearImageArgs) => {
-    return this.withNearMedia({
-      ...args,
-      type: NearMediaType.Image,
-      media: args.image ? args.image : 'UNSET',
-    });
+    if (this.includesNearMediaFilter) {
+      throw new Error('cannot use multiple near<Media> filters in a single query');
+    }
+    try {
+      this.nearMediaString = new NearImage(args).toString();
+      this.nearMediaType = NearMediaType.Image;
+      this.includesNearMediaFilter = true;
+    } catch (e: any) {
+      this.addError(e.toString());
+    }
+    return this;
   };
 
   withNearAudio = (args: NearAudioArgs) => {

src/graphql/nearImage.ts

@@ -0,0 +1,51 @@
+import { NearMediaBase } from './nearMedia';
+
+export interface NearImageArgs extends NearMediaBase {
+  image?: string;
+}
+
+export default class GraphQLNearImage {
+  private certainty?: number;
+  private distance?: number;
+  private image?: string;
+
+  constructor(args: NearImageArgs) {
+    this.certainty = args.certainty;
+    this.distance = args.distance;
+    this.image = args.image;
+  }
+
+  toString(wrap = true) {
+    this.validate();
+
+    let args: string[] = [];
+
+    if (this.image) {
+      let img = this.image;
+      if (img.startsWith('data:')) {
+        const base64part = ';base64,';
+        img = img.substring(img.indexOf(base64part) + base64part.length);
+      }
+      args = [...args, `image:${JSON.stringify(img)}`];
+    }
+
+    if (this.certainty) {
+      args = [...args, `certainty:${this.certainty}`];
+    }
+
+    if (this.distance) {
+      args = [...args, `distance:${this.distance}`];
+    }
+
+    if (!wrap) {
+      return `${args.join(',')}`;
+    }
+    return `{${args.join(',')}}`;
+  }
+
+  validate() {
+    if (!this.image) {
+      throw new Error('nearImage filter: image field must be present');
+    }
+  }
+}

src/graphql/nearMedia.ts

@@ -7,7 +7,7 @@ export interface NearMediaArgs extends NearMediaBase {
   type: NearMediaType;
 }
 export interface NearImageArgs extends NearMediaBase {
-  image?: string;
+  image: string;
 }
 export interface NearAudioArgs extends NearMediaBase {
   audio: string;
@@ -50,10 +50,6 @@ export default class GraphQLNearMedia {
   toString(wrap = true) {
     let args: string[] = [];
 
-    if (this.media === 'UNSET') {
-      throw new Error(`near${this.type} filter: ${this.type.toLowerCase()} field must be present`);
-    }
-
     if (this.media.startsWith('data:')) {
       const base64part = ';base64,';
       this.media = this.media.substring(this.media.indexOf(base64part) + base64part.length);