Skip to content

Commit

Permalink
Showing 23 changed files with 32 additions and 34 deletions.
2 changes: 1 addition & 1 deletion packages/embedder/client/react/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "embedder-client-react",
"name": "embedder/client/react",
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/embedder/client/react/src",
"projectType": "library",
2 changes: 1 addition & 1 deletion packages/plugins/core/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Core",
"packageName": "plugins/core",
"packageName": "@magickml/core-plugin",
"main": "./src/lib/coreEventsPlugin.ts"
}
3 changes: 1 addition & 2 deletions packages/plugins/core/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "plugins/core",
"name": "@magickml/core-plugin",
"version": "0.0.10-1",
"dependencies": {
"@clerk/clerk-sdk-node": "^5.0.7",
@@ -29,7 +29,6 @@
"langchain": "^0.2.0",
"pino": "8.14.1",
"rambdax": "^10.1.0",
"tslib": "^2.3.0",
"typed-emitter": "^2.1.0",
"uuid": "^9.0.0",
"zod": "^3.22.4",
2 changes: 1 addition & 1 deletion packages/plugins/core/src/lib/configx.ts
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import {
} from '@magickml/agent-plugin'
import { EventPayload } from '@magickml/shared-services'
import { PluginCredential } from '@magickml/credentials'
import { createEventsEnum } from 'plugins/shared'
import { createEventsEnum } from '@magickml/shared-plugins'
import { EventTypes } from '@magickml/agent-communication'

// BASE
2 changes: 1 addition & 1 deletion packages/plugins/discord/src/lib/configx.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createEventsEnum } from 'plugins/shared'
import { createEventsEnum } from '@magickml/shared-plugins'
import {
ClientEvents,
ColorResolvable,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EmitterFactory, CreateMessageEvents } from 'plugins/shared'
import { EmitterFactory, CreateMessageEvents } from '@magickml/shared-plugins'
import TypedEmitter from 'typed-emitter'
import { DISCORD_EVENTS } from '../configx'

2 changes: 1 addition & 1 deletion packages/plugins/discord/src/lib/discordPlugin.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type BasePluginInit } from '@magickml/agent-plugin'
import { type CorePluginEvents } from 'plugins/core'
import { type CorePluginEvents } from '@magickml/core-plugin'
import { EventPayload, ActionPayload } from '@magickml/shared-services'
import {
ChannelType,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createActionNode } from 'plugins/shared'
import { createActionNode } from '@magickml/shared-plugins'
import { EventPayload } from '@magickml/shared-services'
import {
type DiscordEventPayload,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createActionNode } from 'plugins/shared'
import { createActionNode } from '@magickml/shared-plugins'
import { EventPayload } from '@magickml/shared-services'
import {
type DiscordEventPayload,
3 changes: 1 addition & 2 deletions packages/plugins/knowledge/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "plugins/knowledge",
"name": "@magickml/knowledge-plugin",
"version": "0.0.10-1",
"dependencies": {
"@magickml/behave-graph": "^0.14.14",
"@magickml/shared-services": "0.0.10-1",
"tslib": "^2.3.0",
"zod": "^3.22.4",
"@magickml/embedder-auth-token": "0.0.10-1",
"@magickml/embedder-client-ts": "0.0.10-1",
2 changes: 1 addition & 1 deletion packages/plugins/shared/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "shared",
"packageName": "plugins/shared",
"packageName": "@magickml/shared-plugins",
"main": "./src/index.ts"
}
6 changes: 3 additions & 3 deletions packages/plugins/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "plugins/shared",
"name": "@magickml/shared-plugins",
"version": "0.0.10-1",
"dependencies": {
"tslib": "^2.3.0",
"typed-emitter": "^2.1.0",
"@magickml/behave-graph": "^0.14.14",
"@magickml/shared-services": "0.0.10-1"
"@magickml/shared-services": "0.0.10-1",
"tslib": "^2.3.0"
},
"type": "commonjs",
"main": "./src/index.js",
2 changes: 1 addition & 1 deletion packages/plugins/slack/config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "slack",
"packageName": "plugins/slack",
"packageName": "@magickml/slack-plugin",
"main": "./src/lib/slackPlugin.ts"
}
2 changes: 1 addition & 1 deletion packages/plugins/slack/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "plugins/slack",
"name": "@magickml/slack-plugin",
"version": "0.0.10-1",
"dependencies": {
"@slack/bolt": "^3.17.0",
2 changes: 1 addition & 1 deletion packages/plugins/slack/src/lib/configx.ts
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import type {
PluginStateType,
} from '@magickml/agent-plugin'
import { PluginCredential } from '@magickml/credentials'
import { createEventsEnum } from 'plugins/shared'
import { createEventsEnum } from '@magickml/shared-plugins'

// BASE
export const slackPluginName = 'slack' as const
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EmitterFactory, CreateMessageEvents } from 'plugins/shared'
import { EmitterFactory, CreateMessageEvents } from '@magickml/shared-plugins'
import TypedEmitter from 'typed-emitter'
import { SLACK_EVENTS } from '../configx'

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createActionNode } from 'plugins/shared'
import { createActionNode } from '@magickml/shared-plugins'
import { EventPayload } from '@magickml/shared-services'
import { type SlackEventPayload, SLACK_DEPENDENCIES } from '../../configx'
import { SocketDefinition } from '@magickml/behave-graph'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createActionNode } from 'plugins/shared'
import { createActionNode } from '@magickml/shared-plugins'
import { type SlackEventPayload, SLACK_DEPENDENCIES } from '../../configx'
import { SocketDefinition } from '@magickml/behave-graph'
import { IEventStore } from '@magickml/grimoire'
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import {
} from '../../configx'
import { SocketDefinition } from '@magickml/behave-graph'
import { IEventStore } from '@magickml/grimoire'
import { createActionNode } from 'plugins/shared'
import { createActionNode } from '@magickml/shared-plugins'

type Inputs = {
flow: SocketDefinition
2 changes: 1 addition & 1 deletion packages/plugins/slack/src/lib/slackPlugin.ts
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ import {
sendSlackAudio,
} from './nodes'
import { WebSocketPlugin } from '@magickml/agent-plugin'
import { type CorePluginEvents } from 'plugins/core'
import { type CorePluginEvents } from '@magickml/core-plugin'
import Bolt, {
type AllMiddlewareArgs,
type MessageEvent,
6 changes: 3 additions & 3 deletions packages/server/agents/src/lib/Agent.ts
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@ import TypedEmitter from 'typed-emitter'
import { Spellbook } from '@magickml/grimoire'
import { AgentLoggingService } from './AgentLogger'

import CorePlugin from 'plugins/core'
import KnowledgePlugin from 'plugins/knowledge'
import CorePlugin from '@magickml/core-plugin'
import KnowledgePlugin from '@magickml/knowledge-plugin'
import DiscordPlugin from 'plugins/discord'
import SlackPlugin from 'plugins/slack'
import SlackPlugin from '@magickml/slack-plugin'

export type RequestPayload = {
projectId: string
6 changes: 3 additions & 3 deletions packages/server/agents/src/lib/AgentV2.ts
Original file line number Diff line number Diff line change
@@ -24,10 +24,10 @@ import { SeraphManager } from '@magickml/seraph-manager'
import EventEmitter from 'events'
import TypedEmitter from 'typed-emitter'

import CorePlugin from 'plugins/core'
import KnowledgePlugin from 'plugins/knowledge'
import CorePlugin from '@magickml/core-plugin'
import KnowledgePlugin from '@magickml/knowledge-plugin'
import DiscordPlugin from 'plugins/discord'
import SlackPlugin from 'plugins/slack'
import SlackPlugin from '@magickml/slack-plugin'

const plugins = [CorePlugin, KnowledgePlugin, DiscordPlugin, SlackPlugin]

8 changes: 4 additions & 4 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -220,11 +220,11 @@
"hailmary": ["portal/cloud/packages/hailmary/src/index.ts"],
"hailmary/server": ["portal/cloud/packages/hailmary/src/server.ts"],
"ideClient": ["portal/cloud/packages/ideClient/src/index.ts"],
"plugins/core": ["packages/plugins/core/src/index.ts"],
"@magickml/core-plugin": ["packages/plugins/core/src/index.ts"],
"plugins/discord": ["packages/plugins/discord/src/index.ts"],
"plugins/knowledge": ["packages/plugins/knowledge/src/index.ts"],
"plugins/shared": ["packages/plugins/shared/src/index.ts"],
"plugins/slack": ["packages/plugins/slack/src/index.ts"],
"@magickml/knowledge-plugin": ["packages/plugins/knowledge/src/index.ts"],
"@magickml/shared-plugins": ["packages/plugins/shared/src/index.ts"],
"@magickml/slack-plugin": ["packages/plugins/slack/src/index.ts"],
"server/cloud-agent-manager": [
"packages/server/cloud-agent-manager/src/index.ts"
],

0 comments on commit 31a08b4

Please sign in to comment.