Revert "feat(js/plugins/ollama): Ollama embeddings (#807)"

This reverts commit fb1c284.
firebase · Sep 16, 2024 · 76ddebd · 76ddebd
1 parent 34d495c
commit 76ddebd
Show file tree

Hide file tree

Showing 33 changed files with 351 additions and 1,924 deletions.
diff --git a/docs/errors/no_new_actions_at_runtime.md b/docs/errors/no_new_actions_at_runtime.md
diff --git a/genkit-tools/cli/src/commands/eval-flow.ts b/genkit-tools/cli/src/commands/eval-flow.ts
@@ -180,7 +180,7 @@ export const evalFlow = new Command('eval:flow')
 
  const evalRun = {
  key: {
- actionRef: `/flow/${flowName}`,
+ actionId: flowName,
  evalRunId,
  createdAt: new Date().toISOString(),
  },

diff --git a/genkit-tools/common/src/eval/index.ts b/genkit-tools/common/src/eval/index.ts
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { DatasetStore, EvalStore } from '../types/eval';
-import { LocalFileDatasetStore } from './localFileDatasetStore';
+import { EvalStore } from '../types/eval';
 import { LocalFileEvalStore } from './localFileEvalStore';
 export { EvalFlowInput, EvalFlowInputSchema } from '../types/eval';
 export * from './exporter';
@@ -25,7 +24,3 @@ export function getEvalStore(): EvalStore {
  // TODO: This should provide EvalStore, based on tools config.
  return LocalFileEvalStore.getEvalStore();
 }
-
-export function getDatasetStore(): DatasetStore {
- return LocalFileDatasetStore.getDatasetStore();
-}
diff --git a/genkit-tools/common/src/eval/localFileDatasetStore.ts b/genkit-tools/common/src/eval/localFileDatasetStore.ts
diff --git a/genkit-tools/common/src/eval/localFileEvalStore.ts b/genkit-tools/common/src/eval/localFileEvalStore.ts
@@ -61,7 +61,10 @@ export class LocalFileEvalStore implements EvalStore {
  }
 
  async save(evalRun: EvalRun): Promise<void> {
- const fileName = this.generateFileName(evalRun.key.evalRunId);
+ const fileName = this.generateFileName(
+ evalRun.key.evalRunId,
+ evalRun.key.actionId
+ );
 
  logger.info(
  `Saving EvalRun ${evalRun.key.evalRunId} to ` +
@@ -82,10 +85,13 @@ export class LocalFileEvalStore implements EvalStore {
  );
  }
 
- async load(evalRunId: string): Promise<EvalRun | undefined> {
+ async load(
+ evalRunId: string,
+ actionId?: string
+ ): Promise<EvalRun | undefined> {
  const filePath = path.resolve(
  this.storeRoot,
- this.generateFileName(evalRunId)
+ this.generateFileName(evalRunId, actionId)
  );
  if (!fs.existsSync(filePath)) {
  return undefined;
@@ -111,8 +117,8 @@ export class LocalFileEvalStore implements EvalStore {
 
  logger.debug(`Found keys: ${JSON.stringify(keys)}`);
 
- if (query?.filter?.actionRef) {
- keys = keys.filter((key) => key.actionRef === query?.filter?.actionRef);
+ if (query?.filter?.actionId) {
+ keys = keys.filter((key) => key.actionId === query?.filter?.actionId);
  logger.debug(`Filtered keys: ${JSON.stringify(keys)}`);
  }
 
@@ -121,8 +127,12 @@ export class LocalFileEvalStore implements EvalStore {
  };
  }
 
- private generateFileName(evalRunId: string): string {
- return `${evalRunId}.json`;
+ private generateFileName(evalRunId: string, actionId?: string): string {
+ if (!actionId) {
+ return `${evalRunId}.json`;
+ }
+
+ return `${actionId?.replace('/', '_')}-${evalRunId}.json`;
  }
 
  private getIndexFilePath(): string {