Skip to content

Commit 1514a1d

Browse files
parzival418parzival418
committed
Huge refactor to make packages publishable
1 parent f200ff8 commit 1514a1d

File tree

326 files changed

+1381
-1548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

326 files changed

+1381
-1548
lines changed

‎.eslintrc.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@
6060
"files": ["./package.json", "./generators.json"],
6161
"parser": "jsonc-eslint-parser",
6262
"rules": {
63-
"@nx/nx-plugin-checks": "error"
63+
"@nx/nx-plugin-checks": "error",
64+
"@nx/dependency-checks": [
65+
"error",
66+
{
67+
"useLocalPathsForWorkspaceDependencies": false,
68+
"ignoredDependencies": ["@llm-tools/embedjs"]
69+
}
70+
]
6471
}
6572
}
6673
]

‎.python-version

-1
This file was deleted.

‎apps/agent-2/src/agent/magickPlugins/corePlugin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
console.log('HELLO WORLD')
2-
import { CorePlugin } from 'plugins/core'
2+
import { CorePlugin } from '@magickml/core-plugin'
33
import { defineMagickPlugin } from '../../modules/agent-module/runtimes/utils/defineMagickPlugin'
44

55
// test

‎apps/agent-connector/agent-load-test.yml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
config:
2+
target: 'ws://localhost:3000' # Update with your server's address
3+
phases:
4+
- duration: 2m
5+
arrivalRate: 1 # New users per second
6+
maxUsers: 20 # Maximum number of virtual users
7+
ws:
8+
# Subprotocols if needed
9+
subprotocols:
10+
- 'protocol1'
11+
- 'protocol2'
12+
13+
scenarios:
14+
- name: 'Simulate user interaction'
15+
engine: 'ws'
16+
flow:
17+
- connect: 'ws://localhost:3000/ws/29fff5e7-bcf0-4f48-802b-ff9c723b3764/{{ $randomNumber(1000, 9999) }}'
18+
- think: 2
19+
- loop:
20+
- send: '{"id": "{{ $uuid }}", "text": "Test message {{ $loopCount }}", "sender": "client", "type": "message"}'
21+
- think: 1
22+
# count: 100 # Send 100 messages per user
23+
# config:
24+
# target: 'ws://localhost:3000' # Update with your server's address
25+
# phases:
26+
# - duration: 60
27+
# arrivalRate: 1 # New users per second
28+
# maxVusers: 10 # Maximum number of virtual users
29+
# ws:
30+
# # Subprotocols if needed
31+
# subprotocols:
32+
# - 'protocol1'
33+
# - 'protocol2'
34+
35+
# scenarios:
36+
# - name: 'Simulate user interaction'
37+
# engine: 'ws'
38+
# flow:
39+
# - connect: 'ws://localhost:3000/ws/29fff5e7-bcf0-4f48-802b-ff9c723b3764/{{ $randomNumber(1000, 9999) }}'
40+
# - think: 2
41+
# - loop:
42+
# - send: '{"id": "{{ $uuid }}", "text": "Test message {{ $loopCount }}", "sender": "client", "type": "message"}'
43+
# - think: 1
44+
# # count: 100 # Send 100 messages per user

‎apps/agent-server/src/RetellClient.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Agent } from 'server/agents'
1+
import { Agent } from '@magickml/agents'
22
import { WebSocket } from 'ws'
33

44
interface Utterance {

‎apps/agent-server/src/main.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { RawData, WebSocket } from 'ws'
22
import express, { Request } from 'express'
33
import expressWsConfig from 'express-ws'
44
import { LLMDummyMock, RetellRequest, RetellResponse } from './RetellClient'
5-
import { initApp } from 'server/core'
6-
import { Agent } from 'server/agents'
5+
import { initApp } from '@magickml/agent-server'
6+
import { Agent } from '@magickml/agents'
77

88
const app = express()
99

‎apps/agent/modules/agent-module/runtime/utils/defineMagickPlugin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { BasePlugin } from 'server/plugin'
1+
import { BasePlugin } from '@magickml/agent-plugin'
22

33
export function defineAgentPlugin(name: string, constructor: BasePlugin) {
44
return {

‎apps/agent/tsconfig.app.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@magickml/embedder/auth/token": [
2828
"packages/embedder/auth/token/src/index.ts"
2929
],
30-
"@magickml/embedder/client/ts": [
30+
"@magickml/embedder-client-ts": [
3131
"packages/embedder/client/ts/src/index.ts"
3232
],
3333
"@magickml/embedder/config": ["packages/embedder/config/src/index.ts"],
@@ -152,6 +152,7 @@
152152
"client/layouts": ["packages/client/layouts/src/index.ts"],
153153
"client/state": ["packages/client/state/src/index.ts"],
154154
"clientConfig": ["packages/client/config/src/index.ts"],
155+
155156
"communication": ["packages/shared/communication/src/index.ts"],
156157
"embedder-db-pg": ["packages/embedder/db/pg/src/index.ts"],
157158
"hailmary": ["portal/cloud/packages/hailmary/src/index.ts"],
@@ -163,13 +164,15 @@
163164
"plugins/shared": ["plugins/shared/src/index.ts"],
164165
"portal-client": ["packages/server/portal-client/src/index.ts"],
165166
"server-storage": ["packages/server/storage/src/index.ts"],
166-
"server/agents": ["packages/server/agents/src/index.ts"],
167167
"server/cloud-agent-manager": [
168168
"packages/server/cloud-agent-manager/src/index.ts"
169169
],
170170
"server/cloud-agent-worker": [
171171
"packages/server/cloud-agent-worker/src/index.ts"
172172
],
173+
174+
"@magickml/agents": ["packages/server/agents/src/index.ts"],
175+
173176
"server/command-hub": ["packages/server/command-hub/src/index.ts"],
174177
"server/communication": ["packages/server/communication/src/index.ts"],
175178
"server/core": ["packages/server/core/src/index.ts"],

‎apps/client/src/main.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
POSTHOG_API_KEY,
88
POSTHOG_ENABLED,
99
STANDALONE,
10-
} from 'shared/config'
10+
} from '@magickml/server-config'
1111
import { PostHogProvider } from 'posthog-js/react'
1212

1313
import { AppConfig } from '@magickml/providers'

‎apps/cloud-agent-manager/src/main.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import {
22
CloudAgentManagerV2,
33
FeathersSyncReporter,
44
} from 'server/cloud-agent-manager'
5-
import { initLogger, getLogger } from 'server/logger'
6-
import { app, initApp } from 'server/core'
7-
import { DONT_CRASH_ON_ERROR, PRODUCTION } from 'shared/config'
5+
import { initLogger, getLogger } from '@magickml/server-logger'
6+
import { app, initApp } from '@magickml/agent-server'
7+
import { DONT_CRASH_ON_ERROR, PRODUCTION } from '@magickml/server-config'
88
import { BullQueue } from 'server/communication'
99
import { initAgentCommander } from '@magickml/agent-commander'
1010

‎apps/cloud-agent-worker/src/main.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { CloudAgentWorker } from 'server/cloud-agent-worker'
2-
import { initLogger, getLogger } from 'server/logger'
3-
import { initApp } from 'server/core'
4-
import { DONT_CRASH_ON_ERROR, PRODUCTION } from 'shared/config'
2+
import { initLogger, getLogger } from '@magickml/server-logger'
3+
import { initApp } from '@magickml/agent-server'
4+
import { DONT_CRASH_ON_ERROR, PRODUCTION } from '@magickml/server-config'
55
import { initAgentCommander } from '@magickml/agent-commander'
66

77
initLogger({ name: 'cloud-agent-worker' })

‎apps/embedder/nitro.config.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -26,61 +26,61 @@ export default defineNitroConfig({
2626
},
2727

2828
alias: {
29-
'@magickml/embedder/auth/plugin': resolve(
29+
'@magickml/embedder-auth-plugin': resolve(
3030
__dirname,
3131
'../../packages/embedder/auth/plugin/src/index.ts'
3232
),
3333
'@magickml/server-db': resolve(
3434
__dirname,
3535
'../../packages/server/db/src/index.ts'
3636
),
37-
'@magickml/embedder/auth/token': resolve(
37+
'@magickml/embedder-auth-token': resolve(
3838
__dirname,
3939
'../../packages/embedder/auth/token/src/index.ts'
4040
),
41-
'@magickml/embedder/client/ts': resolve(
41+
'@magickml/embedder-client-ts': resolve(
4242
__dirname,
4343
'../../packages/embedder/client/ts/src/index.ts'
4444
),
45-
'@magickml/embedder/config': resolve(
45+
'@magickml/embedder-config': resolve(
4646
__dirname,
4747
'../../packages/embedder/config/src/index.ts'
4848
),
49-
'@magickml/embedder/db/pinecone': resolve(
49+
'@magickml/embedder-db-pinecone': resolve(
5050
__dirname,
5151
'../../packages/embedder/db/pinecone/src/index.ts'
5252
),
53-
'embedder-db-pg': resolve(
53+
'@magickml/embedder-db-pg': resolve(
5454
__dirname,
5555
'../../packages/embedder/db/pg/src/index.ts'
5656
),
57-
'@magickml/embedder/queue': resolve(
57+
'@magickml/embedder-queue': resolve(
5858
__dirname,
5959
'../../packages/embedder/queue/src/index.ts'
6060
),
6161

62-
'@magickml/embedder/loaders/core': resolve(
62+
'@magickml/embedder-loaders-core': resolve(
6363
__dirname,
6464
'../../packages/embedder/loaders/core/src/index.ts'
6565
),
66-
'@magickml/embedder/schema': resolve(
66+
'@magickml/embedder-schema': resolve(
6767
__dirname,
6868
'../../packages/embedder/schema/src/index.ts'
6969
),
70-
'@magickml/embedder/worker': resolve(
70+
'@magickml/embedder-worker': resolve(
7171
__dirname,
7272
'../../packages/embedder/worker/src/index.ts'
7373
),
7474

75-
'@magickml/embedder/api/jobs': resolve(
75+
'@magickml/embedder-api-jobs': resolve(
7676
__dirname,
7777
'../../packages/embedder/api/jobs/src/index.ts'
7878
),
79-
'@magickml/embedder/api/loaders': resolve(
79+
'@magickml/embedder-api-loaders': resolve(
8080
__dirname,
8181
'../../packages/embedder/api/loaders/src/index.ts'
8282
),
83-
'@magickml/embedder/api/packs': resolve(
83+
'@magickml/embedder-api-packs': resolve(
8484
__dirname,
8585
'../../packages/embedder/api/packs/src/index.ts'
8686
),

‎apps/embedder/src/server/api/jobs/[id].get.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { JobSchema } from '@magickml/embedder/schema'
2-
import { embedderDb } from 'embedder-db-pg'
1+
import { JobSchema } from '@magickml/embedder-schema'
2+
import { embedderDb } from '@magickml/embedder-db-pg'
33

44
export default defineEventHandler(async event => {
55
const id = getRouterParam(event, 'id')

‎apps/embedder/src/server/api/packs/[id].delete.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { idParse } from '@magickml/embedder/schema'
2-
import { embedderDb, Pack } from 'embedder-db-pg'
1+
import { idParse } from '@magickml/embedder-schema'
2+
import { embedderDb, Pack } from '@magickml/embedder-db-pg'
33
import { eq } from 'drizzle-orm'
44

55
export default defineEventHandler(async event => {

‎apps/embedder/src/server/api/packs/[id].get.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { FindPackResponseSchema, idParse } from '@magickml/embedder/schema'
2-
import { embedderDb } from 'embedder-db-pg'
1+
import { FindPackResponseSchema, idParse } from '@magickml/embedder-schema'
2+
import { embedderDb } from '@magickml/embedder-db-pg'
33

44
export default defineEventHandler(async event => {
55
const packId = idParse(event.context.params?.id)

‎apps/embedder/src/server/api/packs/[id]/context.post.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { z } from 'zod'
22
import { RAGApplicationBuilder } from '@llm-tools/embedjs'
3-
import { embedderDb, Pack } from 'embedder-db-pg'
4-
import { usePineconeDb } from '@magickml/embedder/db/pinecone'
3+
import { embedderDb, Pack } from '@magickml/embedder-db-pg'
4+
import { usePineconeDb } from '@magickml/embedder-db-pinecone'
55
import { eq, and } from 'drizzle-orm'
66
import {
77
authParse,
88
PackQueryRequestSchema,
99
PackQueryContextSchema,
10-
} from '@magickml/embedder/schema'
10+
} from '@magickml/embedder-schema'
1111
import { createError } from 'h3'
1212

1313
export default defineEventHandler(async event => {

‎apps/embedder/src/server/api/packs/[id]/loaders.post.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import {
33
AddLoaderSchema,
44
authParse,
55
idParse,
6-
} from '@magickml/embedder/schema'
7-
import { embedderDb, Loader, Pack } from 'embedder-db-pg'
6+
} from '@magickml/embedder-schema'
7+
import { embedderDb, Loader, Pack } from '@magickml/embedder-db-pg'
88
import { eq, and } from 'drizzle-orm'
9-
import { useBullMQ, createJob } from '@magickml/embedder/queue'
9+
import { useBullMQ, createJob } from '@magickml/embedder-queue'
1010
import { randomUUID } from 'crypto'
1111

1212
export default defineEventHandler(async event => {

‎apps/embedder/src/server/api/packs/[id]/loaders/[loaderId].delete.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { z } from 'zod'
2-
import { embedderDb, Loader } from 'embedder-db-pg'
2+
import { embedderDb, Loader } from '@magickml/embedder-db-pg'
33
import { eq } from 'drizzle-orm'
4-
import { useBullMQ } from '@magickml/embedder/queue'
4+
import { useBullMQ } from '@magickml/embedder-queue'
55

66
export default defineEventHandler(async event => {
77
const packId = z.string().parse(event.context.params?.id)

‎apps/embedder/src/server/api/packs/[id]/loaders/[loaderId].get.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { z } from 'zod'
2-
import { embedderDb, Loader } from 'embedder-db-pg'
2+
import { embedderDb, Loader } from '@magickml/embedder-db-pg'
33
import { and, eq } from 'drizzle-orm'
4-
import { createLoader } from '@magickml/embedder/loaders/core'
5-
import { LoaderWithChunks } from '@magickml/embedder/schema'
4+
import { createLoader } from '@magickml/embedder-loaders-core'
5+
import { LoaderWithChunks } from '@magickml/embedder-schema'
66

77
export default defineEventHandler(async event => {
88
const packId = z.string().parse(event.context.params?.id)

‎apps/embedder/src/server/api/packs/[id]/query.post.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { z } from 'zod'
22
import { RAGApplicationBuilder } from '@llm-tools/embedjs'
3-
import { embedderDb, Pack } from 'embedder-db-pg'
4-
import { usePineconeDb } from '@magickml/embedder/db/pinecone'
3+
import { embedderDb, Pack } from '@magickml/embedder-db-pg'
4+
import { usePineconeDb } from '@magickml/embedder-db-pinecone'
55
import { eq, and } from 'drizzle-orm'
6-
import { authParse, PackQueryRequestSchema } from '@magickml/embedder/schema'
6+
import { authParse, PackQueryRequestSchema } from '@magickml/embedder-schema'
77
import { createError } from 'h3'
88
import consola from 'consola'
99

‎apps/embedder/src/server/api/packs/index.get.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { embedderDb, Pack } from 'embedder-db-pg'
1+
import { embedderDb, Pack } from '@magickml/embedder-db-pg'
22
import { eq, and } from 'drizzle-orm'
3-
import { authParse } from '@magickml/embedder/schema'
3+
import { authParse } from '@magickml/embedder-schema'
44

55
export default defineEventHandler(async event => {
66
const { entity, owner } = authParse(event.context)

‎apps/embedder/src/server/api/packs/index.post.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import {
22
authParse,
33
CreatePackRequestSchema,
44
CreatePackResponseSchema,
5-
} from '@magickml/embedder/schema'
5+
} from '@magickml/embedder-schema'
66
import { randomUUID } from 'crypto'
7-
import { embedderDb, Pack } from 'embedder-db-pg'
7+
import { embedderDb, Pack } from '@magickml/embedder-db-pg'
88
import { defineEventHandler, readBody } from 'h3'
99

1010
export default defineEventHandler(async event => {

‎apps/embedder/src/server/plugins/auth.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//@ts-expect-error
2-
import { embedderAuthPlugin } from '@magickml/embedder/auth/plugin'
2+
import { embedderAuthPlugin } from '@magickml/embedder-auth-plugin'
33

44
export default embedderAuthPlugin

‎apps/embedder/src/server/plugins/worker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//@ts-expect-error
2-
import { embedderWorkerPlugin } from '@magickml/embedder/worker'
2+
import { embedderWorkerPlugin } from '@magickml/embedder-worker'
33

44
export default embedderWorkerPlugin

‎apps/server/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
**/
55

66
import cors from '@koa/cors'
7-
import { initApp, app } from 'server/core'
8-
import { initLogger, getLogger } from 'server/logger'
7+
import { initApp, app } from '@magickml/agent-server'
8+
import { initLogger, getLogger } from '@magickml/server-logger'
99
import { Context } from 'koa'
1010
import koaBody from 'koa-body'
1111
import 'regenerator-runtime/runtime'

‎apps/server/src/services/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For more information about this file, visit https://dove.feathersjs.com/guides/cli/application.html#configure-functions.
55
*/
66

7-
// import type { Application } from 'server/core'
7+
// import type { Application } from '@magickml/agent-server'
88
// import { api } from './api/api'
99

1010
/**

0 commit comments

Comments
 (0)