From a3446760e9624873e2629a132357124a11e95cbc Mon Sep 17 00:00:00 2001 From: lesh Date: Thu, 5 Jun 2025 11:34:22 +0300 Subject: [PATCH 1/3] repo cleanup --- .gitignore | 4 ++ .pre-commit-config.yaml | 3 +- motd => assets/dimensionalascii.txt | 0 .../license_file_header.txt | 0 bin/dev | 7 +- dimOS.egg-info/PKG-INFO | 5 -- dimOS.egg-info/SOURCES.txt | 10 --- dimOS.egg-info/dependency_links.txt | 1 - dimOS.egg-info/top_level.txt | 1 - docker/dev/Dockerfile | 2 +- run.sh | 67 ------------------- 11 files changed, 10 insertions(+), 90 deletions(-) rename motd => assets/dimensionalascii.txt (100%) rename LICENSE_HEADER => assets/license_file_header.txt (100%) delete mode 100644 dimOS.egg-info/PKG-INFO delete mode 100644 dimOS.egg-info/SOURCES.txt delete mode 100644 dimOS.egg-info/dependency_links.txt delete mode 100644 dimOS.egg-info/top_level.txt delete mode 100755 run.sh diff --git a/.gitignore b/.gitignore index 2439af14ed..9718f9be5a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,10 @@ __pycache__/ venv* .ssh/ +# Ignore python tooling dirs +*.egg-info/ +__pycache__ + .env **/.DS_Store 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..c488d0fd87 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/dev/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/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 From b106360581acf085701d47ffd3a1c1a74eb46776 Mon Sep 17 00:00:00 2001 From: lesh Date: Thu, 5 Jun 2025 11:41:18 +0300 Subject: [PATCH 2/3] /bin/dev bugfix --- bin/dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/dev b/bin/dev index c488d0fd87..509fa5e14d 100755 --- a/bin/dev +++ b/bin/dev @@ -98,7 +98,7 @@ find_devcontainer_bin() { bin_path=$(command -v devcontainer) if [[ -z "$bin_path" ]]; then - bin_path="$REPO_ROOT/dev/node_modules/.bin/devcontainer" + bin_path="$REPO_ROOT/bin/node_modules/.bin/devcontainer" fi if [[ -x "$bin_path" ]]; then From e5a34c988db93fa5a2700c306a0c172fdd04394d Mon Sep 17 00:00:00 2001 From: stash Date: Sat, 7 Jun 2025 15:39:46 -0700 Subject: [PATCH 3/3] Removed dist/ PyPi build artifact --- .gitignore | 3 +++ dist/dimos-0.0.0-py3-none-any.whl | Bin 1133 -> 0 bytes dist/dimos-0.0.0.tar.gz | Bin 862 -> 0 bytes 3 files changed, 3 insertions(+) delete mode 100644 dist/dimos-0.0.0-py3-none-any.whl delete mode 100644 dist/dimos-0.0.0.tar.gz diff --git a/.gitignore b/.gitignore index 9718f9be5a..48717f7e6a 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ tests/data/* node_modules package.json package-lock.json + +# Ignore build artifacts +dist/ 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 9d6535daee38468b297a7989c6887325f4663b48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1133 zcmWIWW@Zs#U|`^2P+s9531l!Zfe0WF1mcv;-27tw`1s7c%#!$cy@E<+h5)#R@|FIP z+a`Gn=K>Yh1F;-TgRX%d2&QBfm*{5ZrRD4Ux`sHqIEFad_84*-|Hmbk!d|E zAj)dHro^Uhmn&^2n7k!_{kHPn`Ihh9Nk45%USo6ZDCM|Al5r|Bg}RH_{ugk`dhF)d znt!C-Yo)x&Rj%)MH*affJtbyn8F{Syy?0rj#Vy6W+T&j%E}AXfup)-B4%MORN9SLO z0Xi@mh^28lG~C10)rb4Mhws^oyxzK6=gyqp9At3C_(75XS#Mo0os;^Tf;9YeHFY&k zoD)XtVBG#wRr@yEYd(AdQZ0WNUwMfk=B2$+YwW=(O))Wbmdj0I_^QEuU zo`n__GNOf^^~}~A96-mg0kJYpN0sCk#OI`zrRM0BRFrt1Jabn6855d8@kJ?fz5xwL zXJlZI!D&#CtFwQQOX-=jMa~Wk3=gX3rK;97JM*8K_RIT3m#4n9npwsMDeps<%Zmz3 z?*Bc#y6u~F&+2VS68XD1zoe>Z{pOF{nsDWB*16}Jj}3n11^E^F8o8+KGxw4x$@`V; z{WSB37sLLO_j!-!-~Y5KJ?84Y7kUjRHt?kAJTJ*KIsS>ob>6YnN1rC$ogValdD_~{ zq{fO@56>-J+_8#H)ws z6NAl}c5N^+y7h2Y&ysta#G{`{Y~S`ucy_B*PkiS`i}*L$rzaSGF3`*KH$MEuhri&9 z(uVlX@K+ z6JgdZoMwR&D!M`F$q8XlJ}_N?{evhPn2yu(&S4cATU| z>(r^*m!`GV&~{T*QAP~SMm|JL1)BEX=Y+PSDIirMY1ObyqDD4`ZH7kJ*mn2*FMK+b(lE)M+yQO_N_| zX&jBN^(G-S;(0}`}{&VPmBl_=c)PLvDh5WZo|1Z9L?0r7_a9&6JyHak| zf9|;z{WovC4rNWoe@pfMtI|Oj=%DvQ&GINs22@y_oCUEO&~k2&`+;(jkl{RzgV}OG zPtCDPCNxjeguI*U>vYyraS%-hbXXipdU1Cw>6`M{o|unQN%2v^^n7TI()cYT2L2EK ze~JDtZ5zSaHvc!TjWDapq!%UQw7=K*e_HaX)bwsJ&HKI|C6V@hD_gF5 zHt)rHe`PP$hqmp-`Zf>t0{##GhyTO>;r}}|v=;woj92_$*e-|vHvvK&`9J(0{ty3$ z|L@Au>dgPmXvP0IlkorM&OhQE{*U!P?ezbR>wl!{dIGA@KL1biem(L3wE8dUnFjS= z$p4`K4d;K%^^pIyTL0H>#O*Qucjtfi`Y)NVi~29~ME(c;hyFLM{~i<2|CZ|i!&;F2 z#{Vw;7xvoyKkgRmKTI9~{cnQH+f#l;k|0*}n0Ct<(Ir7y(wm!}OF|8Q?#3(Cz1;&^ zmi-n(Tk3qfe-FqNxmnc_7u%K7txH0ck7iM(Z+q7Yin|07)FS`K?|;wd|6Bh5=a6Fo zXxschS9+dVqw%DM_}`iT$?EzaM+)SB&G^5XO#I?@?-kL(#Q!;urlB$8@=X}%!toi* o7ytkO00000000000000000000000000N~~D51H0mYXEov0GuP!EdT%j