diff --git a/.gitignore b/.gitignore index 2439af14ed..48717f7e6a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,10 @@ __pycache__/ venv* .ssh/ +# Ignore python tooling dirs +*.egg-info/ +__pycache__ + .env **/.DS_Store @@ -26,3 +30,6 @@ tests/data/* node_modules package.json package-lock.json + +# Ignore build artifacts +dist/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a351f8ee89..ab63bb1204 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,10 +15,9 @@ repos: # (for globally changing wording or something) #- --remove-header - --license-filepath - - LICENSE_HEADER + - assets/license_file_header.txt - --use-current-year - - repo: https://github.com/astral-sh/ruff-pre-commit rev: v0.11.11 hooks: diff --git a/motd b/assets/dimensionalascii.txt similarity index 100% rename from motd rename to assets/dimensionalascii.txt diff --git a/LICENSE_HEADER b/assets/license_file_header.txt similarity index 100% rename from LICENSE_HEADER rename to assets/license_file_header.txt diff --git a/bin/dev b/bin/dev index 65243af917..509fa5e14d 100755 --- a/bin/dev +++ b/bin/dev @@ -79,7 +79,8 @@ devcontainer_install() { exit 1 fi - if [[ ! -d "$REPO_ROOT/node_modules" ]]; then + cd "$REPO_ROOT/bin/" + if [[ ! -d "$REPO_ROOT/bin/node_modules" ]]; then npm init -y 1>/dev/null fi npm install @devcontainers/cli 1>&2 @@ -87,7 +88,7 @@ devcontainer_install() { echo "Failed to install devcontainer CLI. Please install it manually." exit 1 fi - echo $REPO_ROOT/node_modules/.bin/devcontainer + echo $REPO_ROOT/bin/node_modules/.bin/devcontainer } @@ -97,7 +98,7 @@ find_devcontainer_bin() { bin_path=$(command -v devcontainer) if [[ -z "$bin_path" ]]; then - bin_path="$REPO_ROOT/node_modules/.bin/devcontainer" + bin_path="$REPO_ROOT/bin/node_modules/.bin/devcontainer" fi if [[ -x "$bin_path" ]]; then diff --git a/dimOS.egg-info/PKG-INFO b/dimOS.egg-info/PKG-INFO deleted file mode 100644 index 16cffd96ea..0000000000 --- a/dimOS.egg-info/PKG-INFO +++ /dev/null @@ -1,5 +0,0 @@ -Metadata-Version: 2.1 -Name: dimos -Version: 0.0.0 -Summary: Coming soon -Author-email: Stash Pomichter diff --git a/dimOS.egg-info/SOURCES.txt b/dimOS.egg-info/SOURCES.txt deleted file mode 100644 index 2a64a65d11..0000000000 --- a/dimOS.egg-info/SOURCES.txt +++ /dev/null @@ -1,10 +0,0 @@ -pyproject.toml -dimOS.egg-info/PKG-INFO -dimOS.egg-info/SOURCES.txt -dimOS.egg-info/dependency_links.txt -dimOS.egg-info/top_level.txt -dimos/__init__.py -dimos.egg-info/PKG-INFO -dimos.egg-info/SOURCES.txt -dimos.egg-info/dependency_links.txt -dimos.egg-info/top_level.txt \ No newline at end of file diff --git a/dimOS.egg-info/dependency_links.txt b/dimOS.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/dimOS.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/dimOS.egg-info/top_level.txt b/dimOS.egg-info/top_level.txt deleted file mode 100644 index 70edfe204b..0000000000 --- a/dimOS.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -dimos diff --git a/dist/dimos-0.0.0-py3-none-any.whl b/dist/dimos-0.0.0-py3-none-any.whl deleted file mode 100644 index 9d6535daee..0000000000 Binary files a/dist/dimos-0.0.0-py3-none-any.whl and /dev/null differ diff --git a/dist/dimos-0.0.0.tar.gz b/dist/dimos-0.0.0.tar.gz deleted file mode 100644 index ad6e61e525..0000000000 Binary files a/dist/dimos-0.0.0.tar.gz and /dev/null differ diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index a210fd4e15..a42807daf8 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -23,7 +23,7 @@ COPY docker/dev/dev-requirements.txt /app/ RUN --mount=type=cache,target=/root/.cache/pip pip install -r dev-requirements.txt # Copy files and add version to motd -COPY motd /etc/motd +COPY /assets/dimensionalascii.txt /etc/motd COPY /docker/dev/bash.sh /root/.bash.sh COPY /docker/dev/tmux.conf /root/.tmux.conf diff --git a/run.sh b/run.sh deleted file mode 100755 index a702ad2185..0000000000 --- a/run.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -# Function to display menu options -show_menu() { - echo "🐳 DIMOS Runner 🐳" - echo "==================================" - echo "Available commands:" - echo " 0 | unitree : Build and run dimOS agent & interface with unitree go2" - echo " 1 | web : Build and run web-os container" - echo " 2 | hf-local : Build and run huggingface local model" - echo " 3 | hf-remote : Build and run huggingface remote model" - echo " 4 | gguf : Build and run ctransformers-gguf model" - echo "==================================" -} - -# Function to run docker compose commands -run_docker_compose() { - local file=$1 - local rebuild=$2 - - if [ "$rebuild" = "full" ]; then - echo "📦 Full rebuild with --no-cache..." - docker compose -f $file down --rmi all -v && \ - docker compose -f $file build --no-cache && \ - docker compose -f $file up - else - echo "🚀 Building and running containers..." - docker compose -f $file down && \ - docker compose -f $file build && \ - docker compose -f $file up - fi -} - -# Check if an argument was provided -if [ $# -gt 0 ]; then - option=$1 -else - show_menu - read -p "Enter option (number or command): " option -fi - -# Process the option - support both numbers and text commands -case $option in - 0|unitree) - run_docker_compose "./docker/unitree/agents_interface/docker-compose.yml" - ;; - 1|web) - run_docker_compose "./docker/interface/docker-compose.yml" - ;; - 2|hf-local) - run_docker_compose "./docker/models/huggingface_local/docker-compose.yml" - ;; - 3|hf-remote) - run_docker_compose "./docker/models/huggingface_remote/docker-compose.yml" - ;; - 4|gguf) - run_docker_compose "./docker/models/ctransformers_gguf/docker-compose.yml" - ;; - help|--help|-h) - show_menu - ;; - *) - echo "❌ Invalid option: $option" - show_menu - exit 1 - ;; -esac \ No newline at end of file