Skip to content

Commit cf76c3b

Browse files
authored
Liqun/custom image (#427)
1 parent 683501b commit cf76c3b

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

docker/ces_container/entrypoint.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ groupmod -g $GROUP_ID taskweaver
99

1010
chown -R taskweaver:taskweaver /app
1111

12-
su taskweaver -c "python -m taskweaver.ces.kernel.launcher"
12+
su taskweaver -c "python -m venv --system-site-packages venv"
13+
su taskweaver -c "bash -c 'source venv/bin/activate; python -m taskweaver.ces.kernel.launcher'"
1314

taskweaver/ces/kernel/launcher.py

-4
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ def start_app():
8383
if __name__ == "__main__":
8484
if sys.path[0] == "":
8585
del sys.path[0]
86-
import site
8786

88-
user_site_packages = site.getusersitepackages()
89-
if user_site_packages not in sys.path:
90-
sys.path.append(site.getusersitepackages())
9187
logger.info("Starting process...")
9288
logger.info("sys.path: %s", sys.path)
9389
logger.info("os.getcwd(): %s", os.getcwd())

tests/unit_tests/test_environment.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,11 @@ def test_environment_start_outside_container():
161161
cwd = os.path.dirname(os.path.abspath(__file__))
162162
sessions = os.path.join(cwd, "sessions")
163163
try:
164-
env = Environment("local", env_mode=EnvMode.Container)
164+
env = Environment(
165+
"local",
166+
env_mode=EnvMode.Container,
167+
custom_image="taskweavercontainers/taskweaver-executor:0.3",
168+
)
165169
env.start_session(
166170
session_id="session_id",
167171
session_dir=os.path.join(sessions, "session_id"),
@@ -177,13 +181,11 @@ def test_environment_start_outside_container():
177181
connection_file = glob.glob(conn_file_glob)[0]
178182
ports_file = os.path.join(ces_dir, "ports.json")
179183
assert os.path.isfile(ports_file)
180-
181-
connect_and_execute_code(connection_file, ports_file)
182-
183-
saved_file = os.path.join(session_dir, "cwd", "filename.txt")
184-
assert os.path.isfile(saved_file)
184+
code = "!pip install yfinance\nimport sys\nprint(sys.path)\nimport yfinance as yf\nprint(yf.__version__)"
185+
connect_and_execute_code(connection_file, ports_file, code=code)
185186

186187
env.stop_session("session_id")
188+
187189
finally:
188190
# delete sessions
189191
shutil.rmtree(sessions)

0 commit comments

Comments
 (0)