OSS bug fixes (#2)

Author: jiahuei

.env

@@ -22,6 +22,5 @@ OWL_CONCURRENT_ROWS_BATCH_SIZE=3
 OWL_CONCURRENT_COLS_BATCH_SIZE=5
 
 # Frontend config
-FRONTEND_PORT=4000
 JAMAI_URL=http://owl:${OWL_PORT}
 PUBLIC_JAMAI_URL=

.github/workflows/ci.yml

@@ -80,7 +80,7 @@ jobs:
           set +e
           while true; do
               docker ps
-              response=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:${OWL_PORT:-6969}/health)
+              response=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:${OWL_PORT:-6969}/api/health)
               echo $response
               if [ $response -eq 200 ]; then
                   break
@@ -90,11 +90,11 @@ jobs:
           done
           printf "> DONE\n"
         env:
-          JAMAI_API_KEY: ${{ secrets.JAMAI_API_KEY }}
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
           TOGETHER_API_KEY: ${{ secrets.TOGETHER_API_KEY }}
+          # JAMAI_API_KEY: ${{ secrets.JAMAI_API_KEY }}
           COMPOSE_DOCKER_CLI_BUILD: 1
           DOCKER_BUILDKIT: 1
 

.gitignore

@@ -13,6 +13,7 @@ venv/
 
 # Internal references, dependencies, temporary folders & files
 /db*/
+/infinity_cache/
 **/__ref__/
 /dependencies/
 logs/

README.md

@@ -2,6 +2,14 @@
 
 ![JamAI Base Cover](JamAI_Base_Cover.png)
 
+<!-- prettier-ignore -->
+![Linting](https://github.com/EmbeddedLLM/JamAIBase/actions/workflows/lint.yml/badge.svg)
+![CI](https://github.com/EmbeddedLLM/JamAIBase/actions/workflows/ci.yml/badge.svg)
+
+<!-- prettier-ignore -->
+> [!TIP]
+> [Explore our docs](https://docs.jamaibase.com)
+
 ## Overview
 
 Welcome to JamAI Base – the real-time database that orchestrates Large Language Models (LLMs) for you. Designed to simplify AI integration, JamAI Base offers a Backend as a Service (BaaS) platform with an intuitive, spreadsheet-like interface. Focus on defining your data requirements through natural language prompts, and let us handle the complexities of RAG, LLMOps, conversation histories, and LLM orchestration.
@@ -127,7 +135,12 @@ Focus on defining "what" you want to achieve rather than "how" to achieve it.
    $ docker compose -f docker/compose.nvidia.yml up --quiet-pull -d
    ```
 
-4. Try it out:
+   <!-- prettier-ignore -->
+   > [!TIP]
+   > By default, frontend and backend are accessible at ports 4000 and 6969.
+   > You can change the ports exposed to host by setting env var like so `API_PORT=6970 FRONTEND_PORT=4001 docker compose -f docker/compose.cpu.yml up --quiet-pull -d`
+
+4. Try the command below in your terminal, or open your browser and go to `localhost:4000`.
 
    ```shell
    $ curl localhost:6969/api/v1/models

clients/typescript/JamAI_Base_Cover.png

@@ -84,11 +84,11 @@ export abstract class Base {
         if (maxRetries > 0) {
             axiosRetry(this.httpClient, {
                 retries: this.maxRetries,
-                retryDelay: (retryCount: any) => {
+                retryDelay: (retryCount) => {
                     console.log("Retry attempt: ", retryCount);
                     return retryCount * 1000;
                 },
-                retryCondition: (_error: any) => {
+                retryCondition: (_error) => {
                     return true;
                 }
             });

clients/typescript/src/resources/base.ts

@@ -17,6 +17,8 @@ services:
     restart: unless-stopped
     env_file:
       - ../.env
+    volumes:
+      - ${PWD}/infinity_cache:/app/.cache
     networks:
       - jamai
 
@@ -63,8 +65,6 @@ services:
     #   timeout: 2s
     #   retries: 5
     #   start_period: 1m
-    ports:
-      - "6379:6379"
     # For better performance, consider `host` mode instead `port` to avoid docker NAT.
     # `host` mode is NOT currently supported in Swarm Mode.
     # https://docs.docker.com/compose/compose-file/compose-file-v3/#network_mode
@@ -102,7 +102,7 @@ services:
       - ${PWD}/db:/app/api/db
       - ${PWD}/logs:/app/api/logs
     ports:
-      - "6969:${API_PORT:-6969}"
+      - "${API_PORT:-6969}:6969"
     networks:
       - jamai
 
@@ -117,15 +117,15 @@ services:
       owl:
         condition: service_healthy
     # healthcheck:
-    #   test: ["CMD-SHELL", "curl --silent --fail localhost:6968/api/health || exit 1"]
+    #   test: ["CMD-SHELL", "curl --silent --fail --output /dev/null localhost:4000/project/default/action-table || exit 1"]
     #   interval: 30s
     #   timeout: 2s
     #   retries: 5
     restart: unless-stopped
     environment:
       - NODE_ENV=production
       - BODY_SIZE_LIMIT=Infinity
-      - PORT=4000
+      - FRONTEND_PORT=4000
     env_file:
       - ../.env
     ports:

docker/compose.cpu.yml

@@ -47,5 +47,10 @@ services:
       file: compose.cpu.yml
       service: owl
 
+  frontend:
+    extends:
+      file: compose.cpu.yml
+      service: frontend
+
 networks:
   jamai:

docker/compose.nvidia.yml

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -e
+
+mv .git ../.
+rm -rf *
+rm -rf .*
+mv ../.git .
+git clone https://github.com/EmbeddedLLM/JAM.ai.dev
+rm -rf JAM.ai.dev/.git
+rm -rf JAM.ai.dev/.vscode
+rm -rf JAM.ai.dev/archive
+cp -r JAM.ai.dev/.  .
+source scripts/remove_cloud_modules.sh
+rm -rf JAM.ai.dev/
+sed -i -e 's:JAM.ai.dev:JamAIBase:g' README.md

scripts/copy_repo.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+find . -type f -name "cloud*.py" -delete
+find . -type f -name "compose.*.cloud.yml" -delete
+find . -type d -name "(cloud)" -exec rm -rf {} +
+rm services/app/ecosystem.config.cjs
+rm services/app/ecosystem.json