Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Resolve merge conflicts

Vasek Mlejnsky7893b2ea716f
diff --cc api-service/poetry.lock
index f374cf902,9ee655613..0c1535318
--- a/api-service/poetry.lock
+++ b/api-service/poetry.lock
@@@ -1971,21 -1885,9 +1952,9 @@@ files =
{file = "sniffio-1.3.0.tar.gz", hash = "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101"},
]
- [[package]]
- name = "soupsieve"
- version = "2.4"
- description = "A modern CSS selector implementation for Beautiful Soup."
- category = "main"
- optional = false
- python-versions = ">=3.7"
- files = [
- {file = "soupsieve-2.4-py3-none-any.whl", hash = "sha256:49e5368c2cda80ee7e84da9dbe3e110b70a4575f196efb74e51b94549d921955"},
- {file = "soupsieve-2.4.tar.gz", hash = "sha256:e28dba9ca6c7c00173e34e4ba57448f0688bb681b7c5e8bf4971daafc093d69a"},
- ]
-
[[package]]
name = "sqlalchemy"
-version = "1.4.46"
+version = "1.4.47"
description = "Database Abstraction Library"
category = "main"
optional = false
@@@ -2488,4 -2378,4 +2457,4 @@@ testing = ["big-O", "flake8 (<5)", "jar
[metadata]
lock-version = "2.0"
python-versions = ">=3.8.1,<4.0"
- content-hash = "22eec26c82d0838c50ea6751302c0476e4cd16eb8e7c331aa8d542a0a7e40798"
-content-hash = "acf08976f3aed6785e6ee41379c3593ef63272fa1afdb5139fed67049ba4c433"
++content-hash = "dcc3ceec5a4ffd93848df72cf7788439ca048cc5b0010ede26c647bb6c5a3974"
diff --cc api-service/pyproject.toml
index 95bff3a28,2fe8a987c..f6e13ae63
--- a/api-service/pyproject.toml
+++ b/api-service/pyproject.toml
@@@ -18,8 -18,6 +18,7 @@@ aenum = "^3.1.11
python-dotenv = "^1.0.0"
openai = "^0.27.0"
realtime = "^1.0.0"
+pytest = "^7.2.2"
- beautifulsoup4 = "^4.12.0"
lxml = "^4.9.2"
cchardet = "^2.1.7"