Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Add user openAI key handling

Tomas Valenta2eba3eeb86e1
diff --git a/api-service/agent/smol_agent.py b/api-service/agent/smol_agent.py
index a72aba9c9..1daaf4dcb 100644
--- a/api-service/agent/smol_agent.py
+++ b/api-service/agent/smol_agent.py
@@ -105,11 +105,13 @@ class SmolAgent(AgentBase):
):
callback_manager = AsyncCallbackManager([])
+ print('KWWWWYYY', config['openAIKey'])
+
model: BaseLanguageModel = ChatOpenAI(
temperature=0,
max_tokens=6000,
model_name=model_version,
- openai_api_key=default_openai_api_key,
+ openai_api_key=config['openAIKey'] or default_openai_api_key,
request_timeout=3600,
verbose=True,
# The max time between retries is 1 minute so we set max_retries to 45
diff --git a/api-service/app.py b/api-service/app.py
index 00c8d6901..852a3ac9b 100644
--- a/api-service/app.py
+++ b/api-service/app.py
@@ -1,10 +1,11 @@
+import json
import uuid
import os
from typing import Annotated, Any
from fastapi import Depends, FastAPI, HTTPException
from fastapi.middleware.cors import CORSMiddleware
-from pydantic import BaseModel
+from pydantic import BaseModel, config
from fastapi.security import OAuth2PasswordBearer
from opentelemetry import trace
@@ -59,10 +60,14 @@ async def create_agent_deployment(
db_deployment = await db.get_deployment(project_id)
if db_deployment:
+ secrets= json.loads(db_deployment["decrypted_secrets"]) if db_deployment.get('decrypted_secrets', None) else {}
deployment = await deployment_manager.update_deployment(
db_deployment["id"],
project_id,
- body.config,
+ {
+ **body.config,
+ **secrets,
+ },
)
current_span = trace.get_current_span()
current_span.set_attributes(
diff --git a/api-service/database/database.py b/api-service/database/database.py
index d5d008b32..9c2621584 100644
--- a/api-service/database/database.py
+++ b/api-service/database/database.py
@@ -4,6 +4,7 @@ from typing import Any, List
from database.client import Client
from session.env import EnvVar
+TABLE_DECRYPTED_DEPLOYMENTS = "deployments"
TABLE_DEPLOYMENTS = "deployments"
TABLE_LOGS = "log_files"
TABLE_PROJECTS = "projects"
@@ -15,7 +16,7 @@ class Database:
async def get_deployment(self, project_id: str):
response = (
- await self.client.table(TABLE_DEPLOYMENTS)
+ await self.client.table(TABLE_DECRYPTED_DEPLOYMENTS)
.select("*")
.eq("project_id", project_id)
.limit(1)
@@ -25,7 +26,7 @@ class Database:
async def get_deployment_by_id(self, id: str):
response = (
- await self.client.table(TABLE_DEPLOYMENTS)
+ await self.client.table(TABLE_DECRYPTED_DEPLOYMENTS)
.select("*")
.eq("id", id)
.limit(1)
@@ -36,7 +37,7 @@ class Database:
async def get_deployments(self):
response = (
- await self.client.table(TABLE_DEPLOYMENTS)
+ await self.client.table(TABLE_DECRYPTED_DEPLOYMENTS)
.select("*")
.eq("enabled", True)
.execute()
diff --git a/components/AgentDeploymentsList.tsx b/components/AgentDeploymentsList.tsx
index e2ec0433a..98b4db8a0 100644
--- a/components/AgentDeploymentsList.tsx
+++ b/components/AgentDeploymentsList.tsx
@@ -122,6 +122,16 @@ function AgentDeploymentsList({
{deployment.projects.slug}
</span>
</div>
+ {/* {deployment.secrets &&
+ <span className="text-xs text-gray-500">
+ Open AI API - using your own API key
+ </span>
+ }
+ {!deployment.secrets &&
+ <span className="text-xs text-gray-500">
+ {'Open AI API - using e2b\'s API key'}
+ </span>
+ } */}
</div>
{openDeployments[deployment.id] && (
diff --git a/components/AgentRunLogContent.tsx b/components/AgentRunLogContent.tsx
index 8019193f6..0c4f974b8 100644
--- a/components/AgentRunLogContent.tsx
+++ b/components/AgentRunLogContent.tsx
@@ -67,17 +67,29 @@ function AgentRunLogContent({
</div>
}
</div>
- <Link
- href={pr.url}
- target="_blank"
- rel="noreferrer"
- className="flex items-center space-x-1 text-sm text-gray-400 hover:text-white transition-all"
- >
- <GithubIcon size="16px" />
- <span>
- {pr.repository}
- </span>
- </Link>
+ <div className="flex space-x-4">
+ {log.deployments.secrets &&
+ <span className="text-xs text-gray-500">
+ Open AI API - using your own API key
+ </span>
+ }
+ {!log.deployments.secrets &&
+ <span className="text-xs text-gray-500">
+ {'Open AI API - using e2b\'s API key'}
+ </span>
+ }
+ <Link
+ href={pr.url}
+ target="_blank"
+ rel="noreferrer"
+ className="flex items-center space-x-1 text-sm text-gray-400 hover:text-white transition-all"
+ >
+ <GithubIcon size="16px" />
+ <span>
+ {pr.repository}
+ </span>
+ </Link>
+ </div>
</header>
<div className="flex-1 flex space-x-2 items-start justify-start overflow-hidden my-4">
<Splitter
diff --git a/pages/agent/smol-developer/setup.tsx b/pages/agent/smol-developer/setup.tsx
index c5528a9ad..cbfc599e5 100644
--- a/pages/agent/smol-developer/setup.tsx
+++ b/pages/agent/smol-developer/setup.tsx
@@ -49,6 +49,7 @@ export interface PostAgentBody {
// Commit message for the PR first empty commit
commitMessage: string
templateID: typeof smolDeveloperTemplateID
+ openAIKey?: string
}
const steps = [
@@ -148,6 +149,7 @@ function Setup() {
body: instructions,
commitMessage: 'Initial commit',
templateID: smolDeveloperTemplateID,
+ openAIKey: userOpenAIKey,
})
posthog?.capture('clicked on deploy agent', {
diff --git a/pages/api/agent/index.ts b/pages/api/agent/index.ts
index 3fca42601..7f695c1d7 100644
--- a/pages/api/agent/index.ts
+++ b/pages/api/agent/index.ts
@@ -50,6 +50,7 @@ async function postAgent(req: NextApiRequest, res: NextApiResponse) {
templateID,
branch,
commitMessage,
+ openAIKey,
defaultBranch,
repo,
} = req.body as PostAgentBody
@@ -154,6 +155,7 @@ async function postAgent(req: NextApiRequest, res: NextApiResponse) {
auth: authData as any,
enabled: false,
config: { templateID } as any,
+ ...openAIKey && { secrets: JSON.stringify({ openAIKey }) },
},
},
teams: {
@@ -187,7 +189,7 @@ async function postAgent(req: NextApiRequest, res: NextApiResponse) {
await createAgentDeployment({
project_id: project.id,
- config: { templateID } as any,
+ config: { templateID, openAIKey } as any,
})
const deployment = project.deployments[0]
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 14dd43f58..6f0446410 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -269,6 +269,7 @@ model deployments {
enabled Boolean @default(false)
auth Json?
last_finished_prompt String?
+ secrets String?
projects projects @relation(fields: [project_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
log_files log_files[]
@@ -354,6 +355,27 @@ model log_uploads {
@@schema("public")
}
+/// The underlying view does not contain a valid unique identifier and can therefore currently not be handled by the Prisma Client.
+view decrypted_deployments {
+ id String? @db.Uuid
+ created_at DateTime? @db.Timestamptz(6)
+ logs Json[]
+ project_id String?
+ route_id String?
+ state deployment_state?
+ url String?
+ logs_raw String?
+ config Json?
+ enabled Boolean?
+ auth Json?
+ last_finished_prompt String?
+ secrets String?
+ decrypted_secrets String?
+
+ @@ignore
+ @@schema("public")
+}
+
enum aal_level {
aal1
aal2
diff --git a/prisma/views/public/decrypted_deployments.sql b/prisma/views/public/decrypted_deployments.sql
new file mode 100644
index 000000000..7f4eebfdd
--- /dev/null
+++ b/prisma/views/public/decrypted_deployments.sql
@@ -0,0 +1,31 @@
+SELECT
+ deployments.id,
+ deployments.created_at,
+ deployments.logs,
+ deployments.project_id,
+ deployments.route_id,
+ deployments.state,
+ deployments.url,
+ deployments.logs_raw,
+ deployments.config,
+ deployments.enabled,
+ deployments.auth,
+ deployments.last_finished_prompt,
+ deployments.secrets,
+ CASE
+ WHEN (deployments.secrets IS NULL) THEN NULL :: text
+ ELSE CASE
+ WHEN ('e3cf22c3-d780-452c-ad91-395c88ee6d6e' IS NULL) THEN NULL :: text
+ ELSE convert_from(
+ pgsodium.crypto_aead_det_decrypt(
+ decode(deployments.secrets, 'base64' :: text),
+ convert_to('' :: text, 'utf8' :: name),
+ 'e3cf22c3-d780-452c-ad91-395c88ee6d6e' :: uuid,
+ NULL :: bytea
+ ),
+ 'utf8' :: name
+ )
+ END
+ END AS decrypted_secrets
+FROM
+ deployments;
\ No newline at end of file
diff --git a/styles/global.css b/styles/global.css
index beac9f000..7b4545f50 100644
--- a/styles/global.css
+++ b/styles/global.css
@@ -52,6 +52,11 @@
@apply text-slate-600 font-mono font-semibold border-b border-slate-600;
box-decoration-break: clone;
}
+
+ .security {
+ -webkit-text-security: disc;
+ text-security: disc;
+ }
}
.no-scroller::-webkit-scrollbar {