Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.sh text eol=lf
25 changes: 16 additions & 9 deletions src/magentic_ui/_docker.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import docker
import os
import platform
import sys
from docker.errors import DockerException, ImageNotFound
import logging
Expand All @@ -12,9 +13,15 @@
PYTHON_BUILD_CONTEXT = "magentic-ui-python-env"


def get_docker_client() -> docker.DockerClient:
if platform.system() == "Windows":
os.environ["DOCKER_HOST"] = "npipe:////./pipe/dockerDesktopLinuxEngine"
return docker.from_env()


def check_docker_running() -> bool:
try:
client = docker.from_env()
client = get_docker_client()
client.ping() # type: ignore
return True
except (DockerException, ConnectionError):
Expand Down Expand Up @@ -49,8 +56,8 @@ def check_docker_image(image_name: str, client: docker.DockerClient) -> bool:

def build_browser_image(client: docker.DockerClient | None = None) -> None:
if client is None:
client = docker.from_env()
client = docker.from_env()
client = get_docker_client()
client = get_docker_client()
build_image(
VNC_BROWSER_IMAGE + ":latest",
os.path.join(_PACKAGE_DIR, "docker", VNC_BROWSER_BUILD_CONTEXT),
Expand All @@ -60,8 +67,8 @@ def build_browser_image(client: docker.DockerClient | None = None) -> None:

def build_python_image(client: docker.DockerClient | None = None) -> None:
if client is None:
client = docker.from_env()
client = docker.from_env()
client = get_docker_client()
client = get_docker_client()
build_image(
PYTHON_IMAGE + ":latest",
os.path.join(_PACKAGE_DIR, "docker", PYTHON_BUILD_CONTEXT),
Expand All @@ -85,15 +92,15 @@ def check_browser_image(client: docker.DockerClient | None = None) -> bool:
if not check_docker_access():
return False
if client is None:
client = docker.from_env()
client = docker.from_env()
client = get_docker_client()
client = get_docker_client()
return check_docker_image(VNC_BROWSER_IMAGE, client)


def check_python_image(client: docker.DockerClient | None = None) -> bool:
if not check_docker_access():
return False
if client is None:
client = docker.from_env()
client = docker.from_env()
client = get_docker_client()
client = get_docker_client()
return check_docker_image(PYTHON_IMAGE, client)
41 changes: 30 additions & 11 deletions src/magentic_ui/backend/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ def ui(
upgrade_database: bool = False,
config: Optional[str] = None,
rebuild_docker: Optional[bool] = False,
ssl_certfile: Optional[str] = None,
ssl_keyfile: Optional[str] = None,
):
"""
Run Magentic-UI.
Expand All @@ -60,6 +62,8 @@ def ui(
database-uri (str, optional): Database URI to connect to. Defaults to None.
config (str, optional): Path to the config file. Defaults to `config.yaml`.
rebuild_docker: bool, optional: Rebuild the docker images. Defaults to False.
ssl_certfile (str, optional): Path to SSL certificate file. Defaults to None.
ssl_keyfile (str, optional): Path to SSL key file. Defaults to None.
"""

typer.echo(typer.style("Starting Magentic-UI", fg=typer.colors.GREEN, bold=True))
Expand Down Expand Up @@ -133,17 +137,32 @@ def ui(
for key, value in env_vars.items():
temp_env.write(f"{key}={value}\n")

uvicorn.run(
"magentic_ui.backend.web.app:app",
host=host,
port=port,
workers=workers,
reload=reload,
reload_excludes=["**/alembic/*", "**/alembic.ini", "**/versions/*"]
if reload
else None,
env_file=env_file_path,
)
if ssl_certfile and ssl_keyfile:
uvicorn.run(
"magentic_ui.backend.web.app:app",
host=host,
port=port,
workers=workers,
reload=reload,
reload_excludes=["**/alembic/*", "**/alembic.ini", "**/versions/*"]
if reload
else None,
env_file=env_file_path,
ssl_certfile=ssl_certfile,
ssl_keyfile=ssl_keyfile,
)
else:
uvicorn.run(
"magentic_ui.backend.web.app:app",
host=host,
port=port,
workers=workers,
reload=reload,
reload_excludes=["**/alembic/*", "**/alembic.ini", "**/versions/*"]
if reload
else None,
env_file=env_file_path,
)


@app.command()
Expand Down