update import paths

packages/plugins/core/src/lib/config/credentials.ts

@@ -53,7 +53,7 @@ export const corePluginCredentials = [
     pluginName: corePluginName,
   },
   {
-    name: 'PERPLEXITY_API_KEY',
+    name: 'PERPLEXITYAI_API_KEY',
     serviceType: 'perplexity',
     credentialType: 'plugin',
     clientName: 'Perplexity',
@@ -89,7 +89,7 @@ export const corePluginCredentials = [
     pluginName: corePluginName,
   },
   {
-    name: 'TOGETHERAI_API_KEY',
+    name: 'TOGETHER_API_KEY',
     serviceType: 'togetherai',
     credentialType: 'plugin',
     clientName: 'TogetherAI',
@@ -125,7 +125,7 @@ export const corePluginCredentials = [
     pluginName: corePluginName,
   },
   {
-    name: 'OPENROUTER_API_KEY',
+    name: 'OPEN_ROUTER_API_KEY',
     serviceType: 'openrouter',
     credentialType: 'plugin',
     clientName: 'OpenRouter',
@@ -293,7 +293,7 @@ export const corePluginCredentials = [
     pluginName: corePluginName,
   },
   {
-    name: 'VERTEXAI_API_KEY',
+    name: 'GOOGLE_VERTEX_AI_API_KEY',
     serviceType: 'vertexai',
     credentialType: 'plugin',
     clientName: 'VertexAI',
@@ -313,8 +313,3 @@ export type CorePluginCredentialNames = ExtractPluginCredentialNames<
 export type CorePluginCredentialsKeys = {
   [K in CorePluginCredentialNames]: string | undefined
 }
-
-// export type CorePluginCredentials = Record<
-//   CorePluginCredentialNames,
-//   string | undefined
-// >

packages/server/agents-v2/jest.config.ts

@@ -5,7 +5,13 @@ const config: Config = {
   preset: '../../../jest.preset.js',
   testEnvironment: 'node',
   transform: {
-    '^.+\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+    '^.+\\.[tj]sx?$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+        useESM: true,
+      },
+    ],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../../coverage/packages/server/agents-v2',
@@ -14,6 +20,12 @@ const config: Config = {
     '^@/(.*)$': '<rootDir>/src/$1',
   },
   testPathIgnorePatterns: ['/node_modules/', '/__tests__/unit/'],
+  extensionsToTreatAsEsm: ['.ts'],
+  globals: {
+    'ts-jest': {
+      useESM: true,
+    },
+  },
 }
 
 export default config

packages/server/agents-v2/src/lib/Agent.ts

@@ -35,7 +35,7 @@ export class Agent extends EventEmitterWrapper<AgentEvents> {
     // Here we create a new event emitter from a passed in config dependency.
     // We extended from the EventEmitterWrapper class to enable custom event emitters we extend from.
 
-    console.log('EVENT EMITFER', config)
+    console.log('EVENT EMITTER', config)
     const eventEmitter =
       new config.dependencies.eventEmitter() as TypedEmitter<AgentEvents>
     super(eventEmitter)

packages/server/agents-v2/src/lib/dependencies/defaultDependencies.ts

@@ -5,6 +5,7 @@ import { RedisPubSub } from '../dependencies/redisPubSub'
 import { KeywordsLLMService as LLMService } from '../services/LLMService/KeywordsLLMService'
 import { TypedEmitter } from 'tiny-typed-emitter'
 import { DefaultDependenciesType } from '../interfaces/IDependencies'
+import { CredentialManager } from '../services/credentialsManager/credentialsManager'
 
 // Default implementations for the services
 export const DEFAULT_DEPENDENCIES: DefaultDependenciesType = {
@@ -15,5 +16,6 @@ export const DEFAULT_DEPENDENCIES: DefaultDependenciesType = {
   eventEmitter: TypedEmitter,
   // database: DatabaseService,
   eventStore: EventStore,
-  LLMService: LLMService,
+  coreLLMService: LLMService,
+  credentialManager: CredentialManager,
 }

packages/server/agents-v2/src/lib/dependencies/dependency.config.ts

@@ -11,6 +11,7 @@ import { ISpellStorage } from '../interfaces/ISpellStorage'
 import { ICommandHub } from '../interfaces/ICommandHub'
 import { ServiceType } from '../interfaces/IDependencies'
 import { ILLMService } from '../interfaces/ILLMService'
+import { ICredentialManager } from '../interfaces/ICredentialsManager'
 
 /**
  * This is the central source of truth for all dependencies that are available.
@@ -29,7 +30,8 @@ export const DependencyInterfaces = {
   EventEmitter: {} as IEventEmitter,
   SpellStorage: {} as ISpellStorage,
   CommandHub: {} as ICommandHub,
-  LLMService: {} as ILLMService,
+  coreLLMService: {} as ILLMService,
+  CredentialManager: {} as ICredentialManager,
   // We can also just use this to add key:value types for later access
   ['Factory<EventStore>']: {} as unknown,
   // ... other services
@@ -47,7 +49,8 @@ export const CONFIG_TO_SERVICE_MAP = {
   // database: { useSingleton: true, service: 'Database' },
   eventStore: { useSingleton: false, service: 'EventStore' },
   eventEmitter: { useSingleton: true, service: 'EventEmitter' },
-  LLMService: { useSingleton: true, service: 'LLMService' },
+  coreLLMService: { useSingleton: true, service: 'LLMService' },
+  credentialManager: { useSingleton: true, service: 'CredentialManager' },
   // ... other mappings
 } as const
 

packages/server/agents-v2/src/lib/interfaces/ICredentialsManager.ts

@@ -1,4 +1,4 @@
-import { Prisma } from '../../../../db/src'
+import { Prisma } from '@magickml/server-db'
 
 export type Credential = Prisma.$credentialsPayload['scalars']
 

packages/server/agents-v2/src/lib/services/LLMService/KeywordsLLMService.spec.ts

@@ -1,16 +1,18 @@
+import { createOpenAI } from '@magickml/vercel-sdk-core'
+
 import { KeywordsLLMService } from './KeywordsLLMService' // Adjust the import path as needed
-import { KeywordsService } from '../../../../../../cloud/next/keywords/src' // Adjust the import path as needed
-import { createOpenAI } from '../../../../../vercel/core/src/lib/magick-openai/src' // Adjust the import path as needed
+
+import { z } from 'zod'
 import {
-  GenerateObjectResult,
   GenerateObjectRequest,
-} from '../../../../../../shared/llm-service-types/src' // Adjust the import path as needed
-import { z } from 'zod'
-import { StreamObjectRequest } from '../../../../../../shared/llm-service-types/src' // Adjust the import path as needed
+  GenerateObjectResult,
+  StreamObjectRequest,
+} from '@magickml/llm-service-types'
+import { KeywordsService } from '@magickml/keywords-service'
 
 // Mock the dependencies
-jest.mock('../../../../../../cloud/next/keywords/src')
-jest.mock('../../../../../vercel/core/src/lib/magick-openai/src')
+jest.mock('@magickml/keywords-service')
+jest.mock('@magickml/vercel-sdk-core')
 jest.mock('ai')
 
 describe('KeywordsLLMService', () => {

packages/server/agents-v2/src/lib/services/LLMService/KeywordsLLMService.tsx

@@ -6,6 +6,12 @@ import {
   DeepPartial,
 } from 'ai'
 
+import {
+  ILLMService,
+  ExtensibleLanguageModelProvider,
+} from '../../interfaces/ILLMService'
+import { KeywordsService } from '@magickml/keywords-service'
+import { createOpenAI } from '@magickml/vercel-sdk-core'
 import {
   CoreTool,
   ExtensibleLanguageModel,
@@ -17,13 +23,7 @@ import {
   StreamObjectReturn,
   StreamObjectYield,
   StreamTextReturn,
-} from '../../../../../../shared/llm-service-types/src'
-import {
-  ILLMService,
-  ExtensibleLanguageModelProvider,
-} from '../../interfaces/ILLMService'
-import { KeywordsService } from '../../../../../../cloud/next/keywords/src'
-import { createOpenAI } from '../../../../../vercel/core/src/lib/magick-openai/src'
+} from '@magickml/llm-service-types'
 
 type KeywordsModel = {
   model_name: string
@@ -106,7 +106,6 @@ export class KeywordsLLMService implements ILLMService {
     if (!provider || !customerIdentifier) {
       throw new Error('Provider, apiKey, and customerIdentifier are required')
     }
-    console.log('api key', process.env['KEYWORDS_API_KEY'])
     const openai = createOpenAI({
       baseURL: 'https://api.keywordsai.co',
       apiKey: 'QnVif7uB.zeRJatZvTRWe9yABP8nx4ZCeuJuTsxQ3',

packages/server/agents-v2/src/lib/services/credentialsManager/credentialsManager.ts

@@ -1,11 +1,11 @@
-import { CREDENTIALS_ENCRYPTION_KEY } from '../../../../../config/src'
-import { decrypt, encrypt } from '../../../../../credentials/src'
-import { prismaCore } from '../../../../../db/src'
+import { prismaCore } from '@magickml/server-db'
 import {
   CredentialKeyValuePair,
   ICredentialManager,
   Credential,
 } from '../../interfaces/ICredentialsManager'
+import { decrypt, encrypt } from '@magickml/credentials'
+import { CREDENTIALS_ENCRYPTION_KEY } from '@magickml/server-config'
 
 export class CredentialManager implements ICredentialManager {
   protected projectId: string

packages/server/agents-v2/tsconfig.json

@@ -2,13 +2,10 @@
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "module": "commonjs",
-    "moduleResolution": "bundler",
+    "esModuleInterop": true,
     "downlevelIteration": true,
     "experimentalDecorators": true,
-    "allowImportingTsExtensions": true,
-    "emitDeclarationOnly": true,
-    "target": "es2021",
-    "types": ["node"],
+    "emitDeclarationOnly": true
   },
   "files": [],
   "include": [],
@@ -19,5 +16,5 @@
     {
       "path": "./tsconfig.spec.json"
     }
-  ],
+  ]
 }

packages/server/config/src/config.ts

@@ -2,15 +2,14 @@
 import { config } from 'dotenv-flow'
 // import { importMetaEnv } from '../../../client/config/src/lib/import-meta-env'
 import { v4 } from 'uuid'
-import { importMetaEnv } from './import-meta-env'
 
 // Load environment variables
 config({
   path: '../../../.env.*',
 })
 
 // Check whether "process" is defined or not, and assign the appropriate environment object.
-const processEnv = typeof process === 'undefined' ? importMetaEnv : process.env
+const processEnv = process?.env
 
 /**
  * Get an environment variable value for the given key.

packages/cloud/next/keywords/.eslintrc.json → packages/server/keywords/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-  "extends": ["../../../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {

packages/server/keywords/README.md

@@ -0,0 +1,11 @@
+# server-keywords
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build server-keywords` to build the library.
+
+## Running unit tests
+
+Run `nx test server-keywords` to execute the unit tests via [Jest](https://jestjs.io).

packages/cloud/next/keywords/jest.config.ts → packages/server/keywords/jest.config.ts

@@ -1,11 +1,11 @@
 /* eslint-disable */
 export default {
-  displayName: 'keywords',
-  preset: '../../../../jest.preset.js',
+  displayName: 'server-keywords',
+  preset: '../../../jest.preset.js',
   testEnvironment: 'node',
   transform: {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '../../../../coverage/packages/cloud/next/keywords',
+  coverageDirectory: '../../../coverage/packages/server/keywords',
 }

packages/cloud/next/keywords/package.json → packages/server/keywords/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@magickml/keywords",
+  "name": "@magickml/keywords-service",
   "version": "0.0.1",
   "dependencies": {
     "tslib": "^2.3.0"

packages/server/keywords/project.json

@@ -0,0 +1,31 @@
+{
+  "name": "server/keywords",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "packages/server/keywords/src",
+  "projectType": "library",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/packages/server/keywords",
+        "tsConfig": "packages/server/keywords/tsconfig.lib.json",
+        "packageJson": "packages/server/keywords/package.json",
+        "main": "packages/server/keywords/src/index.ts",
+        "assets": ["packages/server/keywords/*.md"]
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "packages/server/keywords/jest.config.ts"
+      }
+    }
+  }
+}

packages/cloud/next/keywords/tsconfig.json → packages/server/keywords/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "module": "commonjs",
     "forceConsistentCasingInFileNames": true,

packages/cloud/next/keywords/tsconfig.lib.json → packages/server/keywords/tsconfig.lib.json

@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "commonjs",
-    "outDir": "../../../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "declaration": true,
     "types": ["node"]
   },

packages/cloud/next/keywords/tsconfig.spec.json → packages/server/keywords/tsconfig.spec.json

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node"]
   },