Merge pull request #4 from noco-ai/v0.3.0

v0.3.0 release
noco-ai · Mar 2, 2024 · 80adb38 · 80adb38
2 parents 29bb1ae + 3824380
commit 80adb38
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -127,4 +127,22 @@ Follow the directions under the *Build and Start Additional Workers (No GPU)* se
 ```bash
 docker compose -f docker-compose-worker.yml build
 GOLEM_VAULT_HOST=10.10.10.X GOLEM_AMQP_HOST=10.10.10.X GOLEM_ID=golem2 docker compose -f docker-compose-worker.yml up
+```
+
+### Port Forwarding
+
+This repository assumes you are running the docker containers on your local system if this is not the case make sure ports **3000** and **4200** are forwarded to the host running the docker containers.
+
+### Fresh Install
+
+For a fresh install of the stack run the following commands, this will remove all downloaded models and all conversation and configuration records.
+
+```bash
+cd spellbook-docker
+docker compose down
+docker volume rm spellbook-docker_models_share
+docker volume rm spellbook-docker_vault_share
+git pull origin master
+docker compose build
+docker compose up
 ```
diff --git a/arcane-bridge/Dockerfile b/arcane-bridge/Dockerfile
@@ -15,8 +15,8 @@ RUN mkdir -p /etc/apt/keyrings && \
 RUN groupadd -r arcane && useradd -r -m -g arcane arcane && \
     mkdir -p /app && chown arcane:arcane /app
 WORKDIR /app
-RUN echo "Installing 0.2.0 of Arcane Bridge"
-RUN git clone --depth 1 --branch v0.2.0 https://github.com/noco-ai/arcane-bridge.git /app
+RUN echo "Installing 0.3.0 of Arcane Bridge"
+RUN git clone --depth 1 --branch v0.3.0 https://github.com/noco-ai/arcane-bridge.git /app
 RUN chown -R arcane:arcane /app
 ENV NPM_CONFIG_PREFIX=/app/.npm-global
 ENV PATH=$PATH:/app/.npm-global/bin

diff --git a/elemental-golem/Dockerfile b/elemental-golem/Dockerfile
@@ -3,7 +3,7 @@ FROM nvidia/cuda:12.1.1-devel-ubuntu22.04
 RUN apt-get update && apt-get upgrade -y \
     && apt-get install -y git build-essential \
     python3 python3-pip gcc tar wget \
-    ocl-icd-opencl-dev opencl-headers clinfo \
+    ocl-icd-opencl-dev opencl-headers clinfo ffmpeg \
     libclblast-dev libopenblas-dev \
     && mkdir -p /etc/OpenCL/vendors && echo "libnvidia-opencl.so.1" > /etc/OpenCL/vendors/nvidia.icd
 
@@ -13,11 +13,11 @@ ENV LLAMA_CUBLAS=1
 RUN groupadd -r golem && useradd -r -m -g golem golem && mkdir /server && chown -R golem:golem /server
 RUN python3 -m pip install --upgrade pip pytest cmake scikit-build setuptools fastapi uvicorn sse-starlette pydantic-settings starlette-context
 RUN CMAKE_ARGS="-DLLAMA_CUBLAS=on" pip install llama-cpp-python
-RUN echo "Installing v0.2.1 of Elemental Golem"
-RUN git clone --depth 1 --branch v0.2.1 https://github.com/noco-ai/elemental-golem.git /server
+RUN echo "Installing v0.3.0 of Elemental Golem"
+RUN git clone --depth 1 --branch v0.3.0 https://github.com/noco-ai/elemental-golem.git /server
 RUN pip install -r /server/requirements.txt
 RUN mkdir -p /server/data/loras/
 WORKDIR /server
 CMD python3 server.py --server-id $GOLEM_ID --amqp-ip $GOLEM_AMQP_HOST --vault-host $GOLEM_VAULT_HOST --vault-token-file /vault_share/read-token --vault-root spellbook --shared-models true
-# CMD tail -f /dev/null
-# python3 server.py --server-id golem1 --vault-host http://10.23.82.2:8200 --vault-token-file /vault_share/read-token --vault-root spellbook --shared-models true
+#CMD tail -f /dev/null
+#python3 server.py --server-id golem1 --vault-host http://10.23.82.2:8200 --vault-token-file /vault_share/read-token --vault-root spellbook --shared-models true
diff --git a/elemental-golem/Dockerfile-nogpu b/elemental-golem/Dockerfile-nogpu
@@ -3,18 +3,17 @@ FROM ubuntu:22.04
 RUN apt-get update && apt-get upgrade -y \
     && apt-get install -y git build-essential \
     python3 python3-pip gcc tar wget \
-    ocl-icd-opencl-dev opencl-headers clinfo    
+    ocl-icd-opencl-dev opencl-headers clinfo ffmpeg 
 
 COPY . .
 RUN groupadd -r golem && useradd -r -m -g golem golem && mkdir /server && chown -R golem:golem /server
 RUN python3 -m pip install --upgrade pip pytest cmake scikit-build setuptools fastapi uvicorn sse-starlette pydantic-settings starlette-context
 RUN pip install llama-cpp-python
-RUN echo "Installing v0.2.1 of Elemental Golem"
-RUN git clone --depth 1 --branch v0.2.1 https://github.com/noco-ai/elemental-golem.git /server
+RUN echo "Installing v0.3.0 of Elemental Golem"
+RUN git clone --depth 1 --branch v0.3.0 https://github.com/noco-ai/elemental-golem.git /server
 RUN pip install -r /server/requirements-nogpu.txt
 RUN mkdir -p /server/data/loras/
 WORKDIR /server
 CMD python3 server.py --server-id $GOLEM_ID --amqp-ip $GOLEM_AMQP_HOST --vault-host $GOLEM_VAULT_HOST --vault-token-file /vault_share/read-token --vault-root spellbook --shared-models true --gpu-type nogpu
 # CMD tail -f /dev/null
 # python3 server.py --server-id golem1 --vault-host http://10.23.82.2:8200 --vault-token-file /vault_share/read-token --vault-root spellbook --shared-models true
-#CMD ["python3", "server.py", "--server-id", "$GOLEM_ID", "--amqp-ip", "$AMQP_IP", "--vault-host", "$VAULT_HOST", "--vault-token-file", "/vault_share/read-token", "--vault-root", "spellbook", "--shared-models", "true", "--gpu-type", "nogpu"]
diff --git a/mariadb/spellbook.sql b/mariadb/spellbook.sql
@@ -44,6 +44,8 @@ DROP TABLE IF EXISTS `chat_conversation`;
 CREATE TABLE `chat_conversation` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL,
+  `ally_id` int(10) unsigned DEFAULT 0,
+  `first_message_id` int(10) unsigned DEFAULT 0,
   `is_private` tinyint(1) NOT NULL,
   `is_shared` tinyint(1) NOT NULL,
   `system_message` text COLLATE utf8mb4_unicode_ci,
@@ -165,7 +167,7 @@ CREATE TABLE `spellbook_module` (
 
 LOCK TABLES `spellbook_module` WRITE;
 /*!40000 ALTER TABLE `spellbook_module` DISABLE KEYS */;
-INSERT INTO `spellbook_module` VALUES (51,'spellbook_skill_builder','1.0.0','available','2023-09-22 22:39:37','2023-09-22 21:17:46'),(52,'spellbook_core','1.0.0','installed','2023-09-22 21:17:46','2023-09-22 21:17:46'),(53,'spellbook_prompt','1.0.0','installed','2023-09-22 21:17:46','2023-09-22 21:17:46'),(54,'spellbook_chat_ability','1.0.0','available','2023-09-26 00:28:46','2023-09-22 21:17:46'),(55,'text_to_speech','1.0.0','available','2023-10-28 17:53:59','2023-09-22 21:17:46'),(56,'music_generator','1.0.0','available','2023-11-10 21:11:28','2023-09-22 21:17:48'),(57,'magento2_module_maker','1.0.0','available','2023-09-25 20:08:24','2023-09-22 21:17:48'),(58,'image_generator','1.0.0','available','2023-10-28 17:53:50','2023-09-22 21:17:48'),(59,'news_search','1.0.0','available','2023-11-10 21:11:17','2023-09-22 21:17:48'),(60,'current_weather','1.0.0','available','2023-11-10 21:11:19','2023-09-22 21:17:48'),(61,'language_translator','1.0.0','available','2023-10-28 17:53:52','2023-09-25 19:53:00'),(62,'apps_skill_builder','1.0.0','installed','2023-10-04 21:50:58','2023-09-26 06:25:47'),(63,'apps_chat_ability_builder','1.0.0','installed','2023-10-06 20:29:51','2023-09-26 06:25:47'),(64,'ftp_transfer','1.0.0','available','2023-10-28 17:54:53','2023-09-28 19:00:35'),(65,'telynx_sms','1.0.0','available','2023-10-28 17:53:56','2023-09-28 22:04:44'),(66,'image_analyzer','1.0.0','available','2023-10-28 17:55:02','2023-10-04 09:06:32'),(67,'wizards_wand','1.0.0','available','2023-11-10 21:11:21','2023-10-23 06:26:48');
+INSERT INTO `spellbook_module` VALUES (51,'app_image_generator','1.0.0','installed','2023-09-22 22:39:37','2023-09-22 21:17:46'),(52,'spellbook_core','1.0.0','installed','2023-09-22 21:17:46','2023-09-22 21:17:46'),(53,'spellbook_prompt','1.0.0','installed','2023-09-22 21:17:46','2023-09-22 21:17:46'),(54,'spellbook_chat_ability','1.0.0','available','2023-09-26 00:28:46','2023-09-22 21:17:46'),(55,'text_to_speech','1.0.0','available','2023-10-28 17:53:59','2023-09-22 21:17:46'),(56,'music_generator','1.0.0','available','2023-11-10 21:11:28','2023-09-22 21:17:48'),(57,'magento2_module_maker','1.0.0','available','2023-09-25 20:08:24','2023-09-22 21:17:48'),(59,'news_search','1.0.0','available','2023-11-10 21:11:17','2023-09-22 21:17:48'),(60,'current_weather','1.0.0','available','2023-11-10 21:11:19','2023-09-22 21:17:48'),(61,'language_translator','1.0.0','available','2023-10-28 17:53:52','2023-09-25 19:53:00'),(62,'apps_skill_builder','1.0.0','installed','2023-10-04 21:50:58','2023-09-26 06:25:47'),(63,'apps_chat_ability_builder','1.0.0','installed','2023-10-06 20:29:51','2023-09-26 06:25:47'),(64,'ftp_transfer','1.0.0','available','2023-10-28 17:54:53','2023-09-28 19:00:35'),(65,'telynx_sms','1.0.0','available','2023-10-28 17:53:56','2023-09-28 22:04:44'),(66,'image_analyzer','1.0.0','available','2023-10-28 17:55:02','2023-10-04 09:06:32'),(67,'wizards_wand','1.0.0','available','2023-11-10 21:11:21','2023-10-23 06:26:48'),(68,'app_sound_studio','1.0.0','installed','2023-09-22 22:39:37','2023-09-22 21:17:46'),(69,'app_library','1.0.0','installed','2023-09-22 22:39:37','2023-09-22 21:17:46'),(70,'app_llm_explorer','1.0.0','installed','2023-09-22 22:39:37','2023-09-22 21:17:46'),(71,'spellbook_digital_ally','1.0.0','installed','2023-09-22 22:39:37','2023-09-22 21:17:46');
 /*!40000 ALTER TABLE `spellbook_module` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

diff --git a/spellbook/Dockerfile b/spellbook/Dockerfile
@@ -9,11 +9,10 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc
 RUN apt-get update
 RUN apt-get install nodejs -y
 RUN npm install -g @angular/cli@latest
-RUN echo "Install v0.2.1 of Spellbook UI"
-RUN git clone --depth 1 --branch v0.2.1 https://github.com/noco-ai/spellbook-ui.git /app
+RUN echo "Install v0.3.0 of Spellbook UI"
+RUN git clone --depth 1 --branch v0.3.0 https://github.com/noco-ai/spellbook-ui.git /app
 WORKDIR /app
 RUN npm install
 ADD spellbook/environment.ts /app/environments/environment.ts
-
 CMD ["ng", "serve", "--host", "0.0.0.0",  "--port", "4200"]
 # CMD tail -f /dev/null