Fix merge conflicts

packages/components/nodes/chatmodels/ChatHuggingFace/ChatHuggingFace.ts

@@ -1,7 +1,7 @@
+import { BaseCache } from '@langchain/core/caches'
+import { HFInput, HuggingFaceInference } from './core'
 import { ICommonObject, INode, INodeData, INodeParams } from '../../../src/Interface'
 import { getBaseClasses, getCredentialData, getCredentialParam } from '../../../src/utils'
-import { HFInput, HuggingFaceInference } from './core'
-import { BaseCache } from 'langchain/schema'
 
 class ChatHuggingFace_ChatModels implements INode {
     label: string
@@ -20,7 +20,7 @@ class ChatHuggingFace_ChatModels implements INode {
         this.name = 'chatHuggingFace'
         this.version = 2.0
         this.type = 'ChatHuggingFace'
-        this.icon = 'huggingface.png'
+        this.icon = 'HuggingFace.svg'
         this.category = 'Chat Models'
         this.description = 'Wrapper around HuggingFace large language models'
         this.baseClasses = [this.type, 'BaseChatModel', ...getBaseClasses(HuggingFaceInference)]

packages/components/nodes/chatmodels/ChatHuggingFace/HuggingFace.svg

@@ -0,0 +1 @@
+<svg width="32" height="32" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#HuggingFace__a)"><circle cx="16" cy="15" r="13" fill="#FFD21E" stroke="#FF9D00" stroke-width="2"/><path d="M13 9a2 2 0 1 0-4 0m14 0a2 2 0 1 0-4 0m3 4c-1.466 1.246-3.61 2.031-6 2.031s-4.534-.785-6-2.031" stroke="#32343D" stroke-width="2" stroke-linecap="round"/><path d="m18.85 20.18.541-2.227a1.14 1.14 0 0 1 2.235.311l.02 1.899 3.14-3.484a1.144 1.144 0 1 1 1.619 1.618l-2.697 2.9 3.506-3.505a1.144 1.144 0 1 1 1.618 1.618l-3.506 3.506 2.532-2.323c.446-.447 1.066-.551 1.513-.105a1.144 1.144 0 0 1 0 1.618l-.845.846c.415-.318.953-.198 1.345.194a1.089 1.089 0 0 1-.078 1.61l-1.722 1.467-3.503 2.586a3.689 3.689 0 0 1-.631.376 4.273 4.273 0 0 1-4.838-.846l-.408-.408c-1.249-1.249-1.317-3.049-.679-4.695l.159-.41a5.12 5.12 0 0 0 .244-.832l.435-1.713Zm-5.901 0-.542-2.227a1.14 1.14 0 0 0-2.235.311l-.02 1.899-3.14-3.484a1.144 1.144 0 1 0-1.618 1.618l2.696 2.9-3.505-3.505a1.144 1.144 0 1 0-1.618 1.618l3.505 3.506-2.531-2.323c-.447-.447-1.067-.551-1.514-.105a1.144 1.144 0 0 0 0 1.618l.845.846c-.414-.318-.953-.198-1.345.194a1.089 1.089 0 0 0 .078 1.61l1.723 1.467 3.502 2.586c.198.146.41.272.631.376a4.273 4.273 0 0 0 4.839-.846l.407-.408c1.25-1.249 1.318-3.049.68-4.695l-.16-.41a5.14 5.14 0 0 1-.244-.832l-.434-1.713Z" fill="#FFD21E" stroke="#FF9D00" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/><circle cx="7" cy="12" r="1" fill="#FFAD03"/><circle cx="25" cy="12" r="1" fill="#FFAD03"/></g><defs><clipPath id="HuggingFace__a"><path fill="#fff" d="M0 0h32v32H0z"/></clipPath></defs></svg>

packages/components/nodes/chatmodels/ChatHuggingFace/core.ts

@@ -1,5 +1,5 @@
+import { LLM, BaseLLMParams } from '@langchain/core/language_models/llms'
 import { getEnvironmentVariable } from '../../../src/utils'
-import { LLM, BaseLLMParams } from 'langchain/llms/base'
 
 export interface HFInput {
     /** Model to use */