Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Use markdown to render logs; make left sidebar smaller and right sidebar bigger

Vasek Mlejnsky0b513145a0e1
diff --git a/api-service/cf-worker-template/index.js b/api-service/cf-worker-template/index.js
index 2d881929c..a35ed7e9e 100644
--- a/api-service/cf-worker-template/index.js
+++ b/api-service/cf-worker-template/index.js
@@ -5,8 +5,8 @@ const router = Router()
async function handlepostRequest(request) {
const body = await request.json()
const { email } = body
- const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
- if (!emailRegex.test(email)) {
+ const regex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+ if (!regex.test(String(email).toLowerCase())) {
return new Response(JSON.stringify({ error: 'Invalid email' }), { status: 400 })
}
return new Response(JSON.stringify({ message: 'Ok' }))
diff --git a/api-service/codegen/js_agent/callbacks/log.py b/api-service/codegen/js_agent/callbacks/log.py
index 2e73db626..2d7cf8d70 100644
--- a/api-service/codegen/js_agent/callbacks/log.py
+++ b/api-service/codegen/js_agent/callbacks/log.py
@@ -12,11 +12,13 @@ from codegen.db.base import Database
class LoggerCallbackHandler(BaseCallbackHandler):
"""Callback Handler that prints to std out."""
- def __init__(self, run_id: str, project_id: str, route_id: str, color: Optional[str] = None) -> None:
+ def __init__(
+ self, run_id: str, project_id: str, route_id: str, color: Optional[str] = None
+ ) -> None:
"""Initialize callback handler."""
- url = os.environ.get('SUPABASE_URL')
- key = os.environ.get('SUPABASE_KEY')
+ url = os.environ.get("SUPABASE_URL")
+ key = os.environ.get("SUPABASE_KEY")
self.db = Database(url, key)
self.run_id = run_id
@@ -28,8 +30,12 @@ class LoggerCallbackHandler(BaseCallbackHandler):
def push_log(self, log: Optional[str]) -> None:
if log is not None:
self.logs.append(log)
- self.db.push_logs(run_id=self.run_id,
- project_id=self.project_id, route_id=self.route_id, logs=self.logs)
+ self.db.push_logs(
+ run_id=self.run_id,
+ project_id=self.project_id,
+ route_id=self.route_id,
+ logs=self.logs,
+ )
def on_llm_start(
self, serialized: Dict[str, Any], prompts: List[str], **kwargs: Any
@@ -56,14 +62,18 @@ class LoggerCallbackHandler(BaseCallbackHandler):
) -> None:
"""Print out that we are entering a chain."""
class_name = serialized["name"]
+ db_log = f"**Entering new {class_name} chain...**"
+ self.push_log(db_log)
+
log = f"\n\n\033[1m> Entering new {class_name} chain...\033[0m"
- self.push_log(log)
print(log)
def on_chain_end(self, outputs: Dict[str, Any], **kwargs: Any) -> None:
"""Print out that we finished a chain."""
+ db_log = "**Finished chain.**"
+ self.push_log(db_log)
+
log = "\n\033[1m> Finished chain.\033[0m"
- self.push_log(log)
print(log)
def on_chain_error(
@@ -85,9 +95,10 @@ class LoggerCallbackHandler(BaseCallbackHandler):
self, action: AgentAction, color: Optional[str] = None, **kwargs: Any
) -> Any:
"""Run on agent action."""
+ db_log = action.log
+ self.push_log(db_log)
+
c = color if color else self.color
- log = get_colored_text(action.log, c)
- self.push_log(log)
print_text(action.log, color=c)
def on_tool_end(
@@ -99,13 +110,13 @@ class LoggerCallbackHandler(BaseCallbackHandler):
**kwargs: Any,
) -> None:
"""If not the final action, print out observation."""
- c = color if color else self.color
- log = f"\n{observation_prefix}\n"
- log += get_colored_text(output, c)
- log += f"\n{llm_prefix}\n"
- self.push_log(log)
+ db_log = f"\n**{observation_prefix}**\n"
+ db_log += output
+ db_log += f"\n{llm_prefix}\n"
+ self.push_log(db_log)
+ c = color if color else self.color
print_text(f"\n{observation_prefix}")
print_text(output, color=c)
print_text(f"\n{llm_prefix}")
@@ -124,20 +135,19 @@ class LoggerCallbackHandler(BaseCallbackHandler):
**kwargs: Optional[str],
) -> None:
"""Run when agent ends."""
- c = color if color else self.color
- log = get_colored_text(text, c) + f"\n{end}"
- self.push_log(log)
+ db_log = f"{text}\n{end}"
+ self.push_log(db_log)
+ c = color if color else self.color
print_text(text, color=c, end=end)
def on_agent_finish(
self, finish: AgentFinish, color: Optional[str] = None, **kwargs: Any
) -> None:
"""Run on agent end."""
- c = color if color else self.color
- log = get_colored_text(finish.log, c) + "\n\n"
- self.push_log(log)
+ db_log = f"{finish.log}\n\n"
+ self.push_log(db_log)
print_text(finish.log, color=color if self.color else color, end="\n")
diff --git a/components/Editor/Logs.tsx b/components/Editor/Logs.tsx
index 617774dbd..8b0d17dbb 100644
--- a/components/Editor/Logs.tsx
+++ b/components/Editor/Logs.tsx
@@ -1,4 +1,7 @@
-import Ansi from 'ansi-to-react'
+import { useEffect } from 'react'
+import ReactMarkdown from 'react-markdown'
+import hljs from 'highlight.js'
+// import Ansi from 'ansi-to-react'
import { Log } from '.'
import { Fragment } from 'react'
@@ -14,6 +17,11 @@ function Logs({
logs,
deploy,
}: Props) {
+
+ useEffect(function highlightCode() {
+ hljs.highlightAll()
+ }, [logs])
+
return (
<Sidebar
side={Sidebar.side.Right}
@@ -46,9 +54,10 @@ function Logs({
">
{logs?.map((l, i) =>
<Fragment key={i}>
- <Ansi>
+ <ReactMarkdown>{l}</ReactMarkdown>
+ {/* <Ansi>
{l}
- </Ansi>
+ </Ansi> */}
<hr />
</Fragment>
)}
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx
index 5238908be..4dc57d37a 100644
--- a/components/Sidebar.tsx
+++ b/components/Sidebar.tsx
@@ -15,7 +15,11 @@ function Sidebar({ children, side, className }: PropsWithChildren<Props>) {
return (
<div
className={clsx(
- 'flex w-[250px] border-slate-200',
+ `
+ flex
+ ${side === Side.Left ? 'w-[180px]' : 'w-[380px]'}
+ border-slate-200
+ `,
{
'border-r': side === Side.Left,
'border-l': side === Side.Right,
diff --git a/package.json b/package.json
index fda0fa3b1..fcc29d890 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"ansi-to-react": "^6.1.6",
"clsx": "^1.2.1",
"express": "^4.18.2",
+ "highlight.js": "^11.7.0",
"human-id": "^4.0.0",
"immer": "^9.0.19",
"lucide-react": "^0.122.0",
@@ -35,6 +36,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hot-keys": "^2.7.2",
+ "react-markdown": "^8.0.5",
"react-textarea-autosize": "^8.4.0",
"sonner": "^0.1.6",
"superjson": "^1.12.2",
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 0fd1148ac..39dc4fe23 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -7,6 +7,7 @@ import { useRouter } from 'next/router'
import clsx from 'clsx'
import { Toaster } from 'sonner'
+import 'highlight.js/styles/github-dark.css'
import 'styles/global.css'
import Header from 'components/Header'
diff --git a/yarn.lock b/yarn.lock
index b1658eada..bae0463bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1797,7 +1797,7 @@
resolved "https://registry.yarnpkg.com/@types/phoenix/-/phoenix-1.5.5.tgz#2276102b16203ca16a5ec3f2e20bcc2819a8a520"
integrity sha512-1eWWT19k0L4ZiTvdXjAvJ9KvW0B8SdiVftQmFPJGTEx78Q4PCSIQDpz+EfkFVR1N4U9gREjlW4JXL8YCIlY0bw==
-"@types/prop-types@*":
+"@types/prop-types@*", "@types/prop-types@^15.0.0":
version "15.7.5"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf"
integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
@@ -4579,6 +4579,11 @@ hast-util-whitespace@^2.0.0:
resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.1.tgz#0ec64e257e6fc216c7d14c8a1b74d27d650b4557"
integrity sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==
+highlight.js@^11.7.0:
+ version "11.7.0"
+ resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.7.0.tgz#3ff0165bc843f8c9bce1fd89e2fda9143d24b11e"
+ integrity sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ==
+
hoist-non-react-statics@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -5428,6 +5433,20 @@ mdast-util-to-hast@^11.0.0:
unist-util-position "^4.0.0"
unist-util-visit "^4.0.0"
+mdast-util-to-hast@^12.1.0:
+ version "12.3.0"
+ resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz#045d2825fb04374e59970f5b3f279b5700f6fb49"
+ integrity sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==
+ dependencies:
+ "@types/hast" "^2.0.0"
+ "@types/mdast" "^3.0.0"
+ mdast-util-definitions "^5.0.0"
+ micromark-util-sanitize-uri "^1.1.0"
+ trim-lines "^3.0.0"
+ unist-util-generated "^2.0.0"
+ unist-util-position "^4.0.0"
+ unist-util-visit "^4.0.0"
+
mdast-util-to-markdown@^1.0.0, mdast-util-to-markdown@^1.3.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.5.0.tgz#c13343cb3fc98621911d33b5cd42e7d0731171c6"
@@ -5734,7 +5753,7 @@ micromark-util-resolve-all@^1.0.0:
dependencies:
micromark-util-types "^1.0.0"
-micromark-util-sanitize-uri@^1.0.0:
+micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.1.0.tgz#f12e07a85106b902645e0364feb07cf253a85aee"
integrity sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==
@@ -6772,7 +6791,7 @@ promise-inflight@^1.0.1:
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@^15.0.0, prop-types@^15.7.2, prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -6911,6 +6930,32 @@ react-is@^16.13.1, react-is@^16.7.0:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
+react-is@^18.0.0:
+ version "18.2.0"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+ integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
+
+react-markdown@^8.0.5:
+ version "8.0.5"
+ resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.5.tgz#c9a70a33ca9aeeafb769c6582e7e38843b9d70ad"
+ integrity sha512-jGJolWWmOWAvzf+xMdB9zwStViODyyFQhNB/bwCerbBKmrTmgmA599CGiOlP58OId1IMoIRsA8UdI1Lod4zb5A==
+ dependencies:
+ "@types/hast" "^2.0.0"
+ "@types/prop-types" "^15.0.0"
+ "@types/unist" "^2.0.0"
+ comma-separated-tokens "^2.0.0"
+ hast-util-whitespace "^2.0.0"
+ prop-types "^15.0.0"
+ property-information "^6.0.0"
+ react-is "^18.0.0"
+ remark-parse "^10.0.0"
+ remark-rehype "^10.0.0"
+ space-separated-tokens "^2.0.0"
+ style-to-object "^0.4.0"
+ unified "^10.0.0"
+ unist-util-visit "^4.0.0"
+ vfile "^5.0.0"
+
react-textarea-autosize@^8.4.0:
version "8.4.0"
resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.4.0.tgz#4d0244d6a50caa897806b8c44abc0540a69bfc8c"
@@ -7074,6 +7119,16 @@ remark-parse@^10.0.0:
mdast-util-from-markdown "^1.0.0"
unified "^10.0.0"
+remark-rehype@^10.0.0:
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279"
+ integrity sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==
+ dependencies:
+ "@types/hast" "^2.0.0"
+ "@types/mdast" "^3.0.0"
+ mdast-util-to-hast "^12.1.0"
+ unified "^10.0.0"
+
remark-rehype@^9.0.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-9.1.0.tgz#e4b5b6e19c125b3780343eb66c3e9b99b0f06a81"
@@ -7539,7 +7594,7 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-style-to-object@^0.4.1:
+style-to-object@^0.4.0, style-to-object@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.1.tgz#53cf856f7cf7f172d72939d9679556469ba5de37"
integrity sha512-HFpbb5gr2ypci7Qw+IOhnP2zOU7e77b+rzM+wTzXzfi1PrtBCX0E7Pk4wL4iTLnhzZ+JgEGAhX81ebTg/aYjQw==
@@ -7770,6 +7825,11 @@ tree-kill@^1.2.2:
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+trim-lines@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-3.0.1.tgz#d802e332a07df861c48802c04321017b1bd87338"
+ integrity sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==
+
trough@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876"