diff --git a/fabric_installer/__init__.py b/installer/__init__.py similarity index 100% rename from fabric_installer/__init__.py rename to installer/__init__.py diff --git a/fabric_installer/client/cli/README.md b/installer/client/cli/README.md similarity index 100% rename from fabric_installer/client/cli/README.md rename to installer/client/cli/README.md diff --git a/fabric_installer/client/cli/__init__.py b/installer/client/cli/__init__.py similarity index 100% rename from fabric_installer/client/cli/__init__.py rename to installer/client/cli/__init__.py diff --git a/fabric_installer/client/cli/fabric.py b/installer/client/cli/fabric.py similarity index 100% rename from fabric_installer/client/cli/fabric.py rename to installer/client/cli/fabric.py diff --git a/fabric_installer/client/cli/p.py b/installer/client/cli/p.py similarity index 100% rename from fabric_installer/client/cli/p.py rename to installer/client/cli/p.py diff --git a/fabric_installer/client/cli/utils.py b/installer/client/cli/utils.py similarity index 100% rename from fabric_installer/client/cli/utils.py rename to installer/client/cli/utils.py diff --git a/fabric_installer/client/gui/.gitignore b/installer/client/gui/.gitignore similarity index 100% rename from fabric_installer/client/gui/.gitignore rename to installer/client/gui/.gitignore diff --git a/fabric_installer/client/gui/README.md b/installer/client/gui/README.md similarity index 100% rename from fabric_installer/client/gui/README.md rename to installer/client/gui/README.md diff --git a/fabric_installer/client/gui/chatgpt.js b/installer/client/gui/chatgpt.js similarity index 100% rename from fabric_installer/client/gui/chatgpt.js rename to installer/client/gui/chatgpt.js diff --git a/fabric_installer/client/gui/index.html b/installer/client/gui/index.html similarity index 100% rename from fabric_installer/client/gui/index.html rename to installer/client/gui/index.html diff --git a/fabric_installer/client/gui/main.js b/installer/client/gui/main.js similarity index 100% rename from fabric_installer/client/gui/main.js rename to installer/client/gui/main.js diff --git a/fabric_installer/client/gui/package-lock.json b/installer/client/gui/package-lock.json similarity index 100% rename from fabric_installer/client/gui/package-lock.json rename to installer/client/gui/package-lock.json diff --git a/fabric_installer/client/gui/package.json b/installer/client/gui/package.json similarity index 100% rename from fabric_installer/client/gui/package.json rename to installer/client/gui/package.json diff --git a/fabric_installer/client/gui/preload.js b/installer/client/gui/preload.js similarity index 100% rename from fabric_installer/client/gui/preload.js rename to installer/client/gui/preload.js diff --git a/fabric_installer/client/gui/static/images/fabric-logo-gif.gif b/installer/client/gui/static/images/fabric-logo-gif.gif similarity index 100% rename from fabric_installer/client/gui/static/images/fabric-logo-gif.gif rename to installer/client/gui/static/images/fabric-logo-gif.gif diff --git a/fabric_installer/client/gui/static/js/bootstrap.min.js b/installer/client/gui/static/js/bootstrap.min.js similarity index 100% rename from fabric_installer/client/gui/static/js/bootstrap.min.js rename to installer/client/gui/static/js/bootstrap.min.js diff --git a/fabric_installer/client/gui/static/js/index.js b/installer/client/gui/static/js/index.js similarity index 100% rename from fabric_installer/client/gui/static/js/index.js rename to installer/client/gui/static/js/index.js diff --git a/fabric_installer/client/gui/static/js/jquery-3.0.0.slim.min.js b/installer/client/gui/static/js/jquery-3.0.0.slim.min.js similarity index 100% rename from fabric_installer/client/gui/static/js/jquery-3.0.0.slim.min.js rename to installer/client/gui/static/js/jquery-3.0.0.slim.min.js diff --git a/fabric_installer/client/gui/static/stylesheet/bootstrap.min.css b/installer/client/gui/static/stylesheet/bootstrap.min.css similarity index 100% rename from fabric_installer/client/gui/static/stylesheet/bootstrap.min.css rename to installer/client/gui/static/stylesheet/bootstrap.min.css diff --git a/fabric_installer/client/gui/static/stylesheet/style.css b/installer/client/gui/static/stylesheet/style.css similarity index 100% rename from fabric_installer/client/gui/static/stylesheet/style.css rename to installer/client/gui/static/stylesheet/style.css diff --git a/fabric_installer/server/__init__.py b/installer/server/__init__.py similarity index 100% rename from fabric_installer/server/__init__.py rename to installer/server/__init__.py diff --git a/fabric_installer/server/api/.env.example b/installer/server/api/.env.example similarity index 100% rename from fabric_installer/server/api/.env.example rename to installer/server/api/.env.example diff --git a/fabric_installer/server/api/__init__.py b/installer/server/api/__init__.py similarity index 100% rename from fabric_installer/server/api/__init__.py rename to installer/server/api/__init__.py diff --git a/fabric_installer/server/api/fabric_api_keys.json b/installer/server/api/fabric_api_keys.json similarity index 100% rename from fabric_installer/server/api/fabric_api_keys.json rename to installer/server/api/fabric_api_keys.json diff --git a/fabric_installer/server/api/fabric_api_server.py b/installer/server/api/fabric_api_server.py similarity index 98% rename from fabric_installer/server/api/fabric_api_server.py rename to installer/server/api/fabric_api_server.py index 1dbece5..1b87c4d 100644 --- a/fabric_installer/server/api/fabric_api_server.py +++ b/installer/server/api/fabric_api_server.py @@ -45,12 +45,12 @@ client = openai.OpenAI(api_key = openai.api_key) # Read API tokens from the apikeys.json file -api_keys = resources.read_text("fabric_installer.server.api", "fabric_api_keys.json") +api_keys = resources.read_text("installer.server.api", "fabric_api_keys.json") valid_tokens = json.loads(api_keys) # Read users from the users.json file -users = resources.read_text("fabric_installer.server.api", "users.json") +users = resources.read_text("installer.server.api", "users.json") users = json.loads(users) diff --git a/fabric_installer/server/api/users.json b/installer/server/api/users.json similarity index 100% rename from fabric_installer/server/api/users.json rename to installer/server/api/users.json diff --git a/fabric_installer/server/webui/__init__.py b/installer/server/webui/__init__.py similarity index 100% rename from fabric_installer/server/webui/__init__.py rename to installer/server/webui/__init__.py diff --git a/fabric_installer/server/webui/fabric-logo-miessler-transparent.png b/installer/server/webui/fabric-logo-miessler-transparent.png similarity index 100% rename from fabric_installer/server/webui/fabric-logo-miessler-transparent.png rename to installer/server/webui/fabric-logo-miessler-transparent.png diff --git a/fabric_installer/server/webui/fabric_web_interface_keys.json b/installer/server/webui/fabric_web_interface_keys.json similarity index 100% rename from fabric_installer/server/webui/fabric_web_interface_keys.json rename to installer/server/webui/fabric_web_interface_keys.json diff --git a/fabric_installer/server/webui/fabric_web_server.py b/installer/server/webui/fabric_web_server.py similarity index 100% rename from fabric_installer/server/webui/fabric_web_server.py rename to installer/server/webui/fabric_web_server.py diff --git a/fabric_installer/server/webui/favicon.ico b/installer/server/webui/favicon.ico similarity index 100% rename from fabric_installer/server/webui/favicon.ico rename to installer/server/webui/favicon.ico diff --git a/fabric_installer/server/webui/static/fabric-logo-miessler-transparent.png b/installer/server/webui/static/fabric-logo-miessler-transparent.png similarity index 100% rename from fabric_installer/server/webui/static/fabric-logo-miessler-transparent.png rename to installer/server/webui/static/fabric-logo-miessler-transparent.png diff --git a/fabric_installer/server/webui/static/favicon.ico b/installer/server/webui/static/favicon.ico similarity index 100% rename from fabric_installer/server/webui/static/favicon.ico rename to installer/server/webui/static/favicon.ico diff --git a/fabric_installer/server/webui/templates/index.html b/installer/server/webui/templates/index.html similarity index 100% rename from fabric_installer/server/webui/templates/index.html rename to installer/server/webui/templates/index.html diff --git a/pyproject.toml b/pyproject.toml index bdb62ae..4cb23a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.poetry] -name = "fabric-installer" +name = "fabric" version = "0.2.0" description = "Fabric - AI framework for human augmentation" authors = [ @@ -7,6 +7,9 @@ authors = [ "Jonathan Dunn ", "Scott Behrens ", ] +packages = [ + { include = "installer"} +] [tool.poetry.dependencies] python = "^3.10" @@ -46,6 +49,6 @@ build-backend = "poetry.core.masonry.api" # Creates python "binaries" [tool.poetry.scripts] -fabric = 'fabric_installer:cli' -fabric-api = 'fabric_installer:run_api_server' -fabric-webui = 'fabric_installer:run_webui_server' +fabric = 'installer:cli' +fabric-api = 'installer:run_api_server' +fabric-webui = 'installer:run_webui_server' diff --git a/setup-aliases.sh b/setup-aliases.sh index c9649aa..fce8b8f 100755 --- a/setup-aliases.sh +++ b/setup-aliases.sh @@ -5,7 +5,7 @@ # It will create aliases (command nicknames) for the python binaries to be known # by your OS -# List of commands to check and add alias for +# List of commands to check and add or update alias for commands=("fabric" "fabric-api" "fabric-webui") # List of shell configuration files to update @@ -21,11 +21,13 @@ for config_file in "${config_files[@]}"; do # Check if the config file contains an alias for the command if grep -q "alias $cmd=" "$config_file"; then - echo "Alias for $cmd already exists in $config_file." + # Replace the existing alias with the new one + sed -i "/alias $cmd=/c\alias $cmd='$CMD_PATH'" "$config_file" + echo "Updated alias for $cmd in $config_file." else # If not, add the alias to the config file - echo "Adding alias for $cmd to $config_file." echo "alias $cmd='$CMD_PATH'" >> "$config_file" + echo "Added alias for $cmd to $config_file." fi done else