From d49611b70cf620a40b76597da484befb441c2654 Mon Sep 17 00:00:00 2001 From: Ladislav Martincik Date: Mon, 18 Nov 2024 12:34:11 +0100 Subject: [PATCH] Fix linter issues --- packages/core/src/embedding.ts | 7 +++---- packages/core/src/generation.ts | 18 +++++++----------- packages/core/src/parsing.ts | 6 ++++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/packages/core/src/embedding.ts b/packages/core/src/embedding.ts index 27401c2593..0bbc51a818 100644 --- a/packages/core/src/embedding.ts +++ b/packages/core/src/embedding.ts @@ -1,11 +1,10 @@ import path from "node:path"; -import { models } from "./models.ts"; -import { IAgentRuntime, ModelProviderName, ModelClass } from "./types.ts"; -import fs from "fs"; import { trimTokens } from "./generation.ts"; -import settings from "./settings.ts"; import elizaLogger from "./logger.ts"; +import { models } from "./models.ts"; +import settings from "./settings.ts"; +import { IAgentRuntime, ModelClass, ModelProviderName } from "./types.ts"; interface EmbeddingOptions { model: string; diff --git a/packages/core/src/generation.ts b/packages/core/src/generation.ts index 90e687ff83..b48c98817d 100644 --- a/packages/core/src/generation.ts +++ b/packages/core/src/generation.ts @@ -1,21 +1,20 @@ import { createAnthropic } from "@ai-sdk/anthropic"; +import { createGoogleGenerativeAI } from "@ai-sdk/google"; import { createGroq } from "@ai-sdk/groq"; import { createOpenAI } from "@ai-sdk/openai"; -import { getModel } from "./models.ts"; import { - generateText as aiGenerateText, generateObject as aiGenerateObject, + generateText as aiGenerateText, GenerateObjectResult, } from "ai"; -import { IImageDescriptionService, ModelClass, Service } from "./types.ts"; import { Buffer } from "buffer"; import { createOllama } from "ollama-ai-provider"; import OpenAI from "openai"; -import { TiktokenModel, get_encoding, encoding_for_model } from "tiktoken"; +import { encoding_for_model, TiktokenModel } from "tiktoken"; import Together from "together-ai"; +import { ZodSchema } from "zod"; import { elizaLogger } from "./index.ts"; -import { models } from "./models.ts"; -import { createGoogleGenerativeAI } from "@ai-sdk/google"; +import { getModel, models } from "./models.ts"; import { parseBooleanFromText, parseJsonArrayFromText, @@ -25,12 +24,9 @@ import { import settings from "./settings.ts"; import { Content, - IAgentRuntime, - ITextGenerationService, - ModelProviderName, - ServiceType, + IAgentRuntime, IImageDescriptionService, ITextGenerationService, ModelClass, ModelProviderName, + ServiceType } from "./types.ts"; -import { ZodSchema } from "zod"; /** * Send a message to the model for a text generateText - receive a string back and parse how you'd like diff --git a/packages/core/src/parsing.ts b/packages/core/src/parsing.ts index e0ab2f0ecc..a52b6d99e3 100644 --- a/packages/core/src/parsing.ts +++ b/packages/core/src/parsing.ts @@ -65,7 +65,7 @@ export function parseJsonArrayFromText(text: string) { if (jsonBlockMatch) { try { jsonData = JSON.parse(jsonBlockMatch[1]); - } catch (e) { + } catch { return null; } } else { @@ -75,7 +75,7 @@ export function parseJsonArrayFromText(text: string) { if (arrayMatch) { try { jsonData = JSON.parse(arrayMatch[0]); - } catch (e) { + } catch { return null; } } @@ -109,6 +109,7 @@ export function parseJSONObjectFromText( try { jsonData = JSON.parse(jsonBlockMatch[1]); } catch (e) { + console.error("Error parsing JSON:", e); return null; } } else { @@ -119,6 +120,7 @@ export function parseJSONObjectFromText( try { jsonData = JSON.parse(objectMatch[0]); } catch (e) { + console.error("Error parsing JSON:", e); return null; } }